feat(klesia sdk): refactor to not require hono instance

Author: mrcnk

apps/klesia/package.json

@@ -5,6 +5,10 @@
 	"module": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"exports": {
+		"./schema": {
+			"types": "./dist/schema.d.ts",
+			"default": "./dist/schema.js"
+		},
 		".": {
 			"types": "./dist/index.d.ts",
 			"default": "./dist/index.js"

apps/klesia/src/schema.ts

@@ -52,6 +52,8 @@ export const RpcMethodSchema = z.discriminatedUnion("method", [
 	}),
 ]);
 
+export type RpcRequestType = z.infer<typeof RpcMethodSchema>;
+
 export const JsonRpcResponse = z.object({
 	jsonrpc: z.literal("2.0"),
 });

apps/klesia/tsup.config.ts

@@ -4,7 +4,7 @@ import sharedConfig from "../../packages/utils/tsup.config";
 
 export default defineConfig({
 	...sharedConfig,
-	entry: ["src/index.ts", "src/server.ts"],
+	entry: ["src/index.ts", "src/server.ts", "src/schema.ts"],
 	external: ["dotenv"],
 	env: dotenv.config().parsed,
 });

bun.lockb

@@ -59,7 +59,7 @@ export const createWalletClient = ({
 			return result;
 		};
 		const getBalanceFromKlesia = async (account: Account) => {
-			const { result } = await klesiaClient.request<"mina_getBalance">({
+			const result = await klesiaClient.request<"mina_getBalance">({
 				method: "mina_getBalance",
 				params: [account.publicKey],
 			});
@@ -75,7 +75,7 @@ export const createWalletClient = ({
 	const getTransactionCount = async () => {
 		if (!account)
 			throw new Error("Account is required to get transaction count");
-		const { result } = await klesiaClient.request<"mina_getTransactionCount">({
+		const result = await klesiaClient.request<"mina_getTransactionCount">({
 			method: "mina_getTransactionCount",
 			params: [account.publicKey],
 		});
@@ -84,7 +84,7 @@ export const createWalletClient = ({
 	const getChainId = async () => {
 		return match(providerSource)
 			.with("klesia", async () => {
-				const { result } = await klesiaClient.request<"mina_chainId">({
+				const result = await klesiaClient.request<"mina_chainId">({
 					method: "mina_chainId",
 				});
 				return result;

packages/connect/src/client.ts

@@ -23,7 +23,7 @@
 		"typescript": "^5.0.0"
 	},
 	"dependencies": {
-		"hono": "^4.5.10",
+		"micro-ftch": "^0.4.0",
 		"ts-pattern": "^5.3.1"
 	}
 }

packages/klesia-sdk/package.json

@@ -3,9 +3,9 @@ import { createClient } from "./client";
 
 it("fetches transaction count", async () => {
 	const client = createClient({ network: "devnet" });
-	const { result } = await client.request<"mina_getTransactionCount">({
+	const count = await client.request<"mina_getTransactionCount">({
 		method: "mina_getTransactionCount",
 		params: ["B62qkYa1o6Mj6uTTjDQCob7FYZspuhkm4RRQhgJg9j4koEBWiSrTQrS"],
 	});
-	expect(BigInt(result)).toBeGreaterThan(0);
+	expect(BigInt(count)).toBeGreaterThan(0);
 });

packages/klesia-sdk/src/client.spec.ts

@@ -1,53 +1,31 @@
 import {
 	KlesiaNetwork,
-	type KlesiaRpc,
-	type RpcErrorType,
+	type RpcRequestType,
 	type RpcResponseType,
-} from "@mina-js/klesia";
-import { hc } from "hono/client";
+} from "@mina-js/klesia/schema";
+import { ftch, jsonrpc } from "micro-ftch";
 import { match } from "ts-pattern";
 
+const net = ftch(fetch);
+
 type CreateClientProps = {
 	network: "mainnet" | "devnet" | "zeko_devnet";
 	customUrl?: string;
-	throwable?: boolean;
-};
-
-const throwRpcError = ({
-	code,
-	message,
-}: { code: number; message: string }) => {
-	throw new Error(`${code} - ${message}`);
 };
 
-export const createClient = ({
-	network,
-	customUrl,
-	throwable = true,
-}: CreateClientProps) => {
+export const createClient = ({ network, customUrl }: CreateClientProps) => {
 	const baseUrl = customUrl
 		? customUrl
 		: match(KlesiaNetwork.parse(network))
 				.with("devnet", () => "https://devnet.klesia.palladians.xyz")
 				.with("mainnet", () => "https://mainnet.klesia.palladians.xyz")
 				.with("zeko_devnet", () => "https://zeko-devnet.klesia.palladians.xyz")
 				.exhaustive();
-	const baseClient = hc<KlesiaRpc>(baseUrl);
-	const rpcHandler = baseClient.api.$post;
-	type RpcRequest = Parameters<typeof rpcHandler>[0];
-	const request = async <T extends string>(req: RpcRequest["json"]) => {
-		const json = (await (
-			await baseClient.api.$post({ json: req })
-		).json()) as Extract<RpcResponseType, { method: T }> & {
-			error?: RpcErrorType;
-		};
-		if (!throwable) {
-			return json;
-		}
-		if (json?.error) {
-			const { code, message } = json.error;
-			return throwRpcError({ code, message });
-		}
+	const rpc = jsonrpc(net, `${baseUrl}/api`);
+	const request = async <T extends string>(req: RpcRequestType) => {
+		const params = req.params ?? [];
+		const json: Extract<RpcResponseType, { method: T }>["result"] =
+			await rpc.call(req.method, ...params);
 		return json;
 	};
 	return {