unwallet-client-sdk 0.21.0 → 0.22.0

package/dist/index.cjs

@@ -6,72 +6,79 @@ var UWError = class extends Error {
 	static {
 		this.prototype.name = "UWError";
 	}
-	constructor(code, message) {
-		super(message !== void 0 ? `${code}: ${message}` : code);
+	constructor(code, msg) {
+		super(msg !== void 0 ? `${code}: ${msg}` : code);
 		this.code = code;
 	}
 };
 //#endregion
 //#region src/config.ts
-function getUnWalletConfigByEnv(env) {
-	switch (env) {
-		case "prod": return {
-			frontend: { baseURL: "https://id.unwallet.world" },
-			xAPI: {
-				url: "wss://xapi.id.unwallet.world",
-				connectionTimeout: 1e4
-			}
-		};
-		case "dev": return {
-			frontend: { baseURL: "http://localhost:4200" },
-			xAPI: {
-				url: "wss://xapi.id.test.unwallet.dev",
-				connectionTimeout: 1e4
-			}
-		};
+const envToUnWalletConfig = {
+	prod: {
+		frontend: { origin: "https://id.unwallet.world" },
+		xAPI: {
+			url: "wss://xapi.id.unwallet.world",
+			connectionTimeout: 1e4
+		}
+	},
+	dev: {
+		frontend: { origin: "http://localhost:4200" },
+		xAPI: {
+			url: "wss://xapi.id.test.unwallet.dev",
+			connectionTimeout: 1e4
+		}
 	}
-}
-const xRequestSchema = zod.z.object({ action: zod.z.enum(["getConnectionID"]) });
-zod.z.string().refine((val) => {
+};
+const xRequestSchema = zod.z.object({ action: zod.z.enum(["getConnectionID"]) }).readonly();
+zod.z.string().transform((val, ctx) => {
 	try {
-		JSON.parse(val);
+		return JSON.parse(val);
 	} catch {
-		return false;
+		ctx.addIssue({
+			code: "custom",
+			message: "Invalid JSON string"
+		});
+		return zod.z.NEVER;
 	}
-	return true;
-}, {
-	abort: true,
-	message: "Invalid JSON string"
-}).transform((val) => JSON.parse(val)).pipe(xRequestSchema);
-const xResponseSchema = zod.z.object({
-	type: zod.z.enum([
-		"connectionID",
-		"signature",
-		"transactionID",
-		"error"
-	]),
-	value: zod.z.string()
-});
-const xResponsePayloadSchema = zod.z.string().refine((val) => {
+}).pipe(xRequestSchema);
+const xResponseSchema = zod.z.union([
+	zod.z.object({
+		type: zod.z.literal("connectionID"),
+		value: zod.z.string().nonempty()
+	}),
+	zod.z.object({
+		type: zod.z.literal("signature"),
+		value: zod.z.string().refine(viem.isHex, { error: "Invalid hex" })
+	}),
+	zod.z.object({
+		type: zod.z.literal("transactionID"),
+		value: zod.z.string().nonempty()
+	}),
+	zod.z.object({
+		type: zod.z.literal("error"),
+		value: zod.z.string().nonempty()
+	})
+]).readonly();
+const xResponsePayloadSchema = zod.z.string().transform((val, ctx) => {
 	try {
-		JSON.parse(val);
-	} catch (e) {
-		return false;
+		return JSON.parse(val);
+	} catch {
+		ctx.addIssue({
+			code: "custom",
+			message: "Invalid JSON string"
+		});
+		return zod.z.NEVER;
 	}
-	return true;
-}, {
-	abort: true,
-	message: "Invalid JSON string"
-}).transform((val) => JSON.parse(val)).pipe(xResponseSchema);
+}).pipe(xResponseSchema);
 var XConnection = class XConnection {
 	constructor(args) {
 		this.responseHandler = null;
 		this.id = args.id;
 		this.socket = args.socket;
-		this.options = args.options ?? {};
+		this.debugOptions = args.debugOptions ?? null;
 		this.initListeners();
 	}
-	static async init(config, opts) {
+	static async init(config) {
 		const socket = new WebSocket(config.url);
 		const id = await new Promise((resolve, reject) => {
 			const timeoutID = setTimeout(() => abortHandshake(new UWError("CONNECTION_TIMEOUT")), config.connectionTimeout);
@@ -115,14 +122,14 @@ var XConnection = class XConnection {
 		return new XConnection({
 			id,
 			socket,
-			options: opts
+			debugOptions: config.debug
 		});
 	}
 	initListeners() {
 		this.socket.onopen = null;
 		this.socket.onmessage = (event) => {
 			if (this.responseHandler === null) {
-				this.options.debugHandlers?.onMessageEventDropped?.(event);
+				this.debugOptions?.handlers?.onMessageEventDropped?.(event);
 				return;
 			}
 			let resp;
@@ -149,7 +156,7 @@ var XConnection = class XConnection {
 		this.socket.onerror = null;
 		this.socket.onclose = (event) => {
 			if (this.responseHandler === null) {
-				this.options.debugHandlers?.onCloseEventDropped?.(event);
+				this.debugOptions?.handlers?.onCloseEventDropped?.(event);
 				return;
 			}
 			this.responseHandler.reject(newConnectionClosedError(event));
@@ -161,8 +168,8 @@ var XConnection = class XConnection {
 	get hasResponseHandler() {
 		return this.responseHandler !== null;
 	}
-	setResponseHandler(handler) {
-		this.responseHandler = handler;
+	setResponseHandler(respHandler) {
+		this.responseHandler = respHandler;
 	}
 	close() {
 		this.socket.close();
@@ -180,9 +187,10 @@ function safeParseXResponsePayload(data) {
 	};
 }
 function newUnexpectedXResponseTypeError(resp) {
-	let msg = `unexpected type: ${resp.type}`;
-	if (resp.type === "error") msg += ` (value: ${resp.value})`;
-	return new UWError("INVALID_RESPONSE", msg);
+	const msgs = [];
+	msgs.push(`unexpected type: ${resp.type}`);
+	if (resp.type === "error") msgs.push(`(value: ${resp.value})`);
+	return new UWError("INVALID_RESPONSE", msgs.join(" "));
 }
 function newConnectionClosedError(event) {
 	return new UWError("CONNECTION_CLOSED", event.reason.length > 0 ? event.reason : void 0);
@@ -200,14 +208,14 @@ var UnWallet = class UnWallet {
 		return new UnWallet({
 			env,
 			clientID: config.clientID,
-			xConnection: await XConnection.init(getUnWalletConfigByEnv(env).xAPI)
+			xConnection: await XConnection.init(envToUnWalletConfig[env].xAPI)
 		});
 	}
 	get unWalletConfig() {
-		return getUnWalletConfigByEnv(this.env);
+		return envToUnWalletConfig[this.env];
 	}
 	authorize(args) {
-		const url = new URL(`${this.unWalletConfig.frontend.baseURL}/${args.isVirtual === false ? "" : "v"}authorize`);
+		const url = new URL(`/${args.isVirtual === false ? "" : "v"}authorize`, this.unWalletConfig.frontend.origin);
 		url.searchParams.set("response_type", "id_token");
 		url.searchParams.set("response_mode", args.responseMode ?? "fragment");
 		url.searchParams.set("client_id", this.clientID);
@@ -217,90 +225,57 @@ var UnWallet = class UnWallet {
 		if (args.chainID !== void 0) url.searchParams.set("chain_id", args.chainID.toString());
 		location.assign(url);
 	}
-	sign(args) {
-		return new Promise((resolve, reject) => {
-			if (this.xConnection.readyState !== WebSocket.OPEN) {
-				reject(new UWError("CONNECTION_NOT_OPENED"));
-				return;
-			}
-			if (this.xConnection.hasResponseHandler) {
-				reject(new UWError("REQUEST_IN_PROGRESS"));
-				return;
-			}
-			const digest = (0, viem.sha256)((0, viem.toBytes)(args.message));
-			this.xConnection.setResponseHandler({
-				resolve: (resp) => {
-					this.xConnection.setResponseHandler(null);
-					if (resp.type !== "signature") {
-						reject(newUnexpectedXResponseTypeError(resp));
-						return;
-					}
-					resolve({
-						digest,
-						signature: resp.value
-					});
-				},
-				reject: (err) => {
-					this.xConnection.setResponseHandler(null);
-					reject(err);
+	async sign(args) {
+		return {
+			digest: (0, viem.sha256)((0, viem.toBytes)(args.message)),
+			signature: await this.request({
+				responseType: "signature",
+				path: "/x/sign",
+				params: {
+					message: args.message,
+					ticketToken: args.ticketToken
 				}
-			});
-			const url = new URL(`${this.unWalletConfig.frontend.baseURL}/x/sign`);
-			url.searchParams.set("connectionID", this.xConnection.id);
-			url.searchParams.set("clientID", this.clientID);
-			url.searchParams.set("message", args.message);
-			url.searchParams.set("ticketToken", args.ticketToken);
-			openWindow(url);
-		});
+			})
+		};
 	}
-	signEIP712TypedData(args) {
-		return new Promise((resolve, reject) => {
-			if (this.xConnection.readyState !== WebSocket.OPEN) {
-				reject(new UWError("CONNECTION_NOT_OPENED"));
-				return;
-			}
-			if (this.xConnection.hasResponseHandler) {
-				reject(new UWError("REQUEST_IN_PROGRESS"));
-				return;
-			}
-			const { EIP712Domain: _, ...typedDataTypes } = args.typedData.types;
-			const typedData = {
-				...args.typedData,
-				types: typedDataTypes
-			};
-			try {
-				(0, viem.validateTypedData)(typedData);
-			} catch (e) {
-				reject(new UWError("INVALID_REQUEST", `invalid typed data: ${e instanceof viem.BaseError ? e.shortMessage : String(e)}`));
-				return;
-			}
-			const digest = (0, viem.hashTypedData)(typedData);
-			this.xConnection.setResponseHandler({
-				resolve: (resp) => {
-					this.xConnection.setResponseHandler(null);
-					if (resp.type !== "signature") {
-						reject(newUnexpectedXResponseTypeError(resp));
-						return;
-					}
-					resolve({
-						digest,
-						signature: resp.value
-					});
-				},
-				reject: (err) => {
-					this.xConnection.setResponseHandler(null);
-					reject(err);
+	async signEIP712TypedData(args) {
+		const { EIP712Domain: _, ...typedDataTypes } = args.typedData.types;
+		const typedData = {
+			...args.typedData,
+			types: typedDataTypes
+		};
+		try {
+			(0, viem.validateTypedData)(typedData);
+		} catch (e) {
+			throw new UWError("INVALID_REQUEST", `invalid typed data: ${e instanceof viem.BaseError ? e.shortMessage : String(e)}`);
+		}
+		return {
+			digest: (0, viem.hashTypedData)(typedData),
+			signature: await this.request({
+				responseType: "signature",
+				path: "/x/signEIP712TypedData",
+				params: {
+					typedData: JSON.stringify(args.typedData),
+					ticketToken: args.ticketToken
 				}
-			});
-			const url = new URL(`${this.unWalletConfig.frontend.baseURL}/x/signEIP712TypedData`);
-			url.searchParams.set("connectionID", this.xConnection.id);
-			url.searchParams.set("clientID", this.clientID);
-			url.searchParams.set("typedData", JSON.stringify(args.typedData));
-			url.searchParams.set("ticketToken", args.ticketToken);
-			openWindow(url);
-		});
+			})
+		};
+	}
+	async sendTransaction(args) {
+		if (args.value === void 0 && args.data === void 0) throw new UWError("INVALID_REQUEST", "either value or data is required");
+		return { transactionID: await this.request({
+			responseType: "transactionID",
+			path: "/x/sendTransaction",
+			params: {
+				chainID: args.chainID.toString(),
+				toAddress: args.toAddress,
+				value: args.value ?? "0x0",
+				data: args.data ?? "0x",
+				ticketToken: args.ticketToken
+			}
+		}) };
 	}
-	sendTransaction(args) {
+	request(args) {
 		return new Promise((resolve, reject) => {
 			if (this.xConnection.readyState !== WebSocket.OPEN) {
 				reject(new UWError("CONNECTION_NOT_OPENED"));
@@ -310,45 +285,31 @@ var UnWallet = class UnWallet {
 				reject(new UWError("REQUEST_IN_PROGRESS"));
 				return;
 			}
-			if (args.value === void 0 && args.data === void 0) {
-				reject(new UWError("INVALID_REQUEST", "either value or data is required"));
-				return;
-			}
 			this.xConnection.setResponseHandler({
 				resolve: (resp) => {
 					this.xConnection.setResponseHandler(null);
-					if (resp.type !== "transactionID") {
+					if (resp.type !== args.responseType) {
 						reject(newUnexpectedXResponseTypeError(resp));
 						return;
 					}
-					resolve({ transactionID: resp.value });
+					resolve(resp.value);
 				},
 				reject: (err) => {
 					this.xConnection.setResponseHandler(null);
 					reject(err);
 				}
 			});
-			const url = new URL(`${this.unWalletConfig.frontend.baseURL}/x/sendTransaction`);
+			const url = new URL(args.path, this.unWalletConfig.frontend.origin);
 			url.searchParams.set("connectionID", this.xConnection.id);
 			url.searchParams.set("clientID", this.clientID);
-			url.searchParams.set("chainID", args.chainID.toString());
-			url.searchParams.set("toAddress", args.toAddress);
-			url.searchParams.set("value", args.value ?? "0x0");
-			url.searchParams.set("data", args.data ?? "0x");
-			url.searchParams.set("ticketToken", args.ticketToken);
-			openWindow(url);
+			for (const [key, value] of Object.entries(args.params)) url.searchParams.set(key, value);
+			window.open(url.toString());
 		});
 	}
 	close() {
 		this.xConnection.close();
 	}
 };
-function openWindow(url) {
-	const width = screen.width / 2;
-	const height = screen.height;
-	const left = screen.width / 4;
-	window.open(url.toString(), "_blank", `width=${width},height=${height},left=${left},top=0`);
-}
 //#endregion
 exports.UWError = UWError;
 exports.UnWallet = UnWallet;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Address, Hex } from "viem";
+import { Address, Hash, Hex } from "viem";
 import { z } from "zod";
 //#region src/config.d.ts
 type Env = "prod" | "dev";
@@ -34,91 +34,98 @@ interface EIP712TypedDataField {
 type UWErrorCode = "CONNECTION_TIMEOUT" | "CONNECTION_FAILED" | "CONNECTION_NOT_OPENED" | "CONNECTION_CLOSED" | "INVALID_REQUEST" | "REQUEST_IN_PROGRESS" | "REQUEST_REJECTED" | "INVALID_RESPONSE";
 declare class UWError extends Error {
   readonly code: UWErrorCode;
-  constructor(code: UWErrorCode, message?: string);
+  constructor(code: UWErrorCode, msg?: string);
 }
 //#endregion
-//#region src/x.d.ts
-declare const xResponseSchema: z.ZodObject<{
-  type: z.ZodEnum<{
-    connectionID: "connectionID";
-    error: "error";
-    signature: "signature";
-    transactionID: "transactionID";
-  }>;
+//#region src/xconn.d.ts
+declare const xResponseSchema: z.ZodReadonly<z.ZodUnion<readonly [z.ZodObject<{
+  type: z.ZodLiteral<"connectionID">;
   value: z.ZodString;
-}, z.core.$strip>;
+}, z.core.$strip>, z.ZodObject<{
+  type: z.ZodLiteral<"signature">;
+  value: z.ZodString & z.ZodType<`0x${string}`, string, z.core.$ZodTypeInternals<`0x${string}`, string>>;
+}, z.core.$strip>, z.ZodObject<{
+  type: z.ZodLiteral<"transactionID">;
+  value: z.ZodString;
+}, z.core.$strip>, z.ZodObject<{
+  type: z.ZodLiteral<"error">;
+  value: z.ZodString;
+}, z.core.$strip>]>>;
 type XResponse = z.infer<typeof xResponseSchema>;
 type XResponseHandler = {
-  resolve: (resp: XResponse) => void;
-  reject: (err: UWError) => void;
+  readonly resolve: (resp: XResponse) => void;
+  readonly reject: (err: UWError) => void;
 };
-type XConnectionOptions = {
-  debugHandlers?: XConnectionDebugHandlers;
+type XConnectionDebugOptions = {
+  readonly handlers?: XConnectionDebugHandlers;
 };
 type XConnectionDebugHandlers = {
-  onMessageEventDropped?: (event: MessageEvent) => void;
-  onCloseEventDropped?: (event: CloseEvent) => void;
+  readonly onMessageEventDropped?: (event: MessageEvent) => void;
+  readonly onCloseEventDropped?: (event: CloseEvent) => void;
 };
 declare class XConnection {
   readonly id: string;
   private readonly socket;
-  private readonly options;
+  private readonly debugOptions;
   private responseHandler;
   constructor(args: {
-    id: string;
-    socket: WebSocket;
-    options?: XConnectionOptions | undefined;
+    readonly id: string;
+    readonly socket: WebSocket;
+    readonly debugOptions?: XConnectionDebugOptions | undefined;
   });
-  static init(config: UnWalletXAPIConfig, opts?: XConnectionOptions): Promise<XConnection>;
+  static init(config: UnWalletXAPIConfig & {
+    readonly debug?: XConnectionDebugOptions | undefined;
+  }): Promise<XConnection>;
   private initListeners;
   get readyState(): number;
   get hasResponseHandler(): boolean;
-  setResponseHandler(handler: XResponseHandler | null): void;
+  setResponseHandler(respHandler: XResponseHandler | null): void;
   close(): void;
 }
 //#endregion
 //#region src/unwallet.d.ts
 type AuthorizationResponseMode = "fragment" | "form_post";
 interface SignResult {
-  digest: string;
-  signature: string;
+  digest: Hash;
+  signature: Hex;
 }
 interface SendTransactionResult {
   transactionID: string;
 }
 declare class UnWallet {
-  private env;
-  private clientID;
-  private xConnection;
+  private readonly env;
+  private readonly clientID;
+  private readonly xConnection;
   constructor(args: {
-    env: Env;
-    clientID: string;
-    xConnection: XConnection;
+    readonly env: Env;
+    readonly clientID: string;
+    readonly xConnection: XConnection;
   });
   static init(config: Config): Promise<UnWallet>;
   private get unWalletConfig();
   authorize(args: {
-    responseMode?: AuthorizationResponseMode;
-    redirectURL: string;
-    nonce?: string;
-    isVirtual?: boolean;
-    chainID?: number;
+    readonly responseMode?: AuthorizationResponseMode;
+    readonly redirectURL: string;
+    readonly nonce?: string;
+    readonly isVirtual?: boolean;
+    readonly chainID?: number;
   }): void;
   sign(args: {
-    message: string;
-    ticketToken: string;
+    readonly message: string;
+    readonly ticketToken: string;
   }): Promise<SignResult>;
   signEIP712TypedData(args: {
-    typedData: EIP712TypedData;
-    ticketToken: string;
+    readonly typedData: EIP712TypedData;
+    readonly ticketToken: string;
   }): Promise<SignResult>;
   sendTransaction(args: {
-    chainID: number;
-    toAddress: string;
-    value?: string;
-    data?: string;
-    ticketToken: string;
+    readonly chainID: number;
+    readonly toAddress: string;
+    readonly value?: string;
+    readonly data?: string;
+    readonly ticketToken: string;
   }): Promise<SendTransactionResult>;
+  private request;
   close(): void;
 }
 //#endregion

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Address, Hex } from "viem";
+import { Address, Hash, Hex } from "viem";
 import { z } from "zod";
 //#region src/config.d.ts
 type Env = "prod" | "dev";
@@ -34,91 +34,98 @@ interface EIP712TypedDataField {
 type UWErrorCode = "CONNECTION_TIMEOUT" | "CONNECTION_FAILED" | "CONNECTION_NOT_OPENED" | "CONNECTION_CLOSED" | "INVALID_REQUEST" | "REQUEST_IN_PROGRESS" | "REQUEST_REJECTED" | "INVALID_RESPONSE";
 declare class UWError extends Error {
   readonly code: UWErrorCode;
-  constructor(code: UWErrorCode, message?: string);
+  constructor(code: UWErrorCode, msg?: string);
 }
 //#endregion
-//#region src/x.d.ts
-declare const xResponseSchema: z.ZodObject<{
-  type: z.ZodEnum<{
-    connectionID: "connectionID";
-    error: "error";
-    signature: "signature";
-    transactionID: "transactionID";
-  }>;
+//#region src/xconn.d.ts
+declare const xResponseSchema: z.ZodReadonly<z.ZodUnion<readonly [z.ZodObject<{
+  type: z.ZodLiteral<"connectionID">;
   value: z.ZodString;
-}, z.core.$strip>;
+}, z.core.$strip>, z.ZodObject<{
+  type: z.ZodLiteral<"signature">;
+  value: z.ZodString & z.ZodType<`0x${string}`, string, z.core.$ZodTypeInternals<`0x${string}`, string>>;
+}, z.core.$strip>, z.ZodObject<{
+  type: z.ZodLiteral<"transactionID">;
+  value: z.ZodString;
+}, z.core.$strip>, z.ZodObject<{
+  type: z.ZodLiteral<"error">;
+  value: z.ZodString;
+}, z.core.$strip>]>>;
 type XResponse = z.infer<typeof xResponseSchema>;
 type XResponseHandler = {
-  resolve: (resp: XResponse) => void;
-  reject: (err: UWError) => void;
+  readonly resolve: (resp: XResponse) => void;
+  readonly reject: (err: UWError) => void;
 };
-type XConnectionOptions = {
-  debugHandlers?: XConnectionDebugHandlers;
+type XConnectionDebugOptions = {
+  readonly handlers?: XConnectionDebugHandlers;
 };
 type XConnectionDebugHandlers = {
-  onMessageEventDropped?: (event: MessageEvent) => void;
-  onCloseEventDropped?: (event: CloseEvent) => void;
+  readonly onMessageEventDropped?: (event: MessageEvent) => void;
+  readonly onCloseEventDropped?: (event: CloseEvent) => void;
 };
 declare class XConnection {
   readonly id: string;
   private readonly socket;
-  private readonly options;
+  private readonly debugOptions;
   private responseHandler;
   constructor(args: {
-    id: string;
-    socket: WebSocket;
-    options?: XConnectionOptions | undefined;
+    readonly id: string;
+    readonly socket: WebSocket;
+    readonly debugOptions?: XConnectionDebugOptions | undefined;
   });
-  static init(config: UnWalletXAPIConfig, opts?: XConnectionOptions): Promise<XConnection>;
+  static init(config: UnWalletXAPIConfig & {
+    readonly debug?: XConnectionDebugOptions | undefined;
+  }): Promise<XConnection>;
   private initListeners;
   get readyState(): number;
   get hasResponseHandler(): boolean;
-  setResponseHandler(handler: XResponseHandler | null): void;
+  setResponseHandler(respHandler: XResponseHandler | null): void;
   close(): void;
 }
 //#endregion
 //#region src/unwallet.d.ts
 type AuthorizationResponseMode = "fragment" | "form_post";
 interface SignResult {
-  digest: string;
-  signature: string;
+  digest: Hash;
+  signature: Hex;
 }
 interface SendTransactionResult {
   transactionID: string;
 }
 declare class UnWallet {
-  private env;
-  private clientID;
-  private xConnection;
+  private readonly env;
+  private readonly clientID;
+  private readonly xConnection;
   constructor(args: {
-    env: Env;
-    clientID: string;
-    xConnection: XConnection;
+    readonly env: Env;
+    readonly clientID: string;
+    readonly xConnection: XConnection;
   });
   static init(config: Config): Promise<UnWallet>;
   private get unWalletConfig();
   authorize(args: {
-    responseMode?: AuthorizationResponseMode;
-    redirectURL: string;
-    nonce?: string;
-    isVirtual?: boolean;
-    chainID?: number;
+    readonly responseMode?: AuthorizationResponseMode;
+    readonly redirectURL: string;
+    readonly nonce?: string;
+    readonly isVirtual?: boolean;
+    readonly chainID?: number;
   }): void;
   sign(args: {
-    message: string;
-    ticketToken: string;
+    readonly message: string;
+    readonly ticketToken: string;
   }): Promise<SignResult>;
   signEIP712TypedData(args: {
-    typedData: EIP712TypedData;
-    ticketToken: string;
+    readonly typedData: EIP712TypedData;
+    readonly ticketToken: string;
   }): Promise<SignResult>;
   sendTransaction(args: {
-    chainID: number;
-    toAddress: string;
-    value?: string;
-    data?: string;
-    ticketToken: string;
+    readonly chainID: number;
+    readonly toAddress: string;
+    readonly value?: string;
+    readonly data?: string;
+    readonly ticketToken: string;
   }): Promise<SendTransactionResult>;
+  private request;
   close(): void;
 }
 //#endregion

package/dist/index.js

@@ -1,76 +1,83 @@
-import { BaseError, hashTypedData, sha256, toBytes, validateTypedData } from "viem";
+import { BaseError, hashTypedData, isHex, sha256, toBytes, validateTypedData } from "viem";
 import { z } from "zod";
 //#region src/error.ts
 var UWError = class extends Error {
 	static {
 		this.prototype.name = "UWError";
 	}
-	constructor(code, message) {
-		super(message !== void 0 ? `${code}: ${message}` : code);
+	constructor(code, msg) {
+		super(msg !== void 0 ? `${code}: ${msg}` : code);
 		this.code = code;
 	}
 };
 //#endregion
 //#region src/config.ts
-function getUnWalletConfigByEnv(env) {
-	switch (env) {
-		case "prod": return {
-			frontend: { baseURL: "https://id.unwallet.world" },
-			xAPI: {
-				url: "wss://xapi.id.unwallet.world",
-				connectionTimeout: 1e4
-			}
-		};
-		case "dev": return {
-			frontend: { baseURL: "http://localhost:4200" },
-			xAPI: {
-				url: "wss://xapi.id.test.unwallet.dev",
-				connectionTimeout: 1e4
-			}
-		};
+const envToUnWalletConfig = {
+	prod: {
+		frontend: { origin: "https://id.unwallet.world" },
+		xAPI: {
+			url: "wss://xapi.id.unwallet.world",
+			connectionTimeout: 1e4
+		}
+	},
+	dev: {
+		frontend: { origin: "http://localhost:4200" },
+		xAPI: {
+			url: "wss://xapi.id.test.unwallet.dev",
+			connectionTimeout: 1e4
+		}
 	}
-}
-const xRequestSchema = z.object({ action: z.enum(["getConnectionID"]) });
-z.string().refine((val) => {
+};
+const xRequestSchema = z.object({ action: z.enum(["getConnectionID"]) }).readonly();
+z.string().transform((val, ctx) => {
 	try {
-		JSON.parse(val);
+		return JSON.parse(val);
 	} catch {
-		return false;
+		ctx.addIssue({
+			code: "custom",
+			message: "Invalid JSON string"
+		});
+		return z.NEVER;
 	}
-	return true;
-}, {
-	abort: true,
-	message: "Invalid JSON string"
-}).transform((val) => JSON.parse(val)).pipe(xRequestSchema);
-const xResponseSchema = z.object({
-	type: z.enum([
-		"connectionID",
-		"signature",
-		"transactionID",
-		"error"
-	]),
-	value: z.string()
-});
-const xResponsePayloadSchema = z.string().refine((val) => {
+}).pipe(xRequestSchema);
+const xResponseSchema = z.union([
+	z.object({
+		type: z.literal("connectionID"),
+		value: z.string().nonempty()
+	}),
+	z.object({
+		type: z.literal("signature"),
+		value: z.string().refine(isHex, { error: "Invalid hex" })
+	}),
+	z.object({
+		type: z.literal("transactionID"),
+		value: z.string().nonempty()
+	}),
+	z.object({
+		type: z.literal("error"),
+		value: z.string().nonempty()
+	})
+]).readonly();
+const xResponsePayloadSchema = z.string().transform((val, ctx) => {
 	try {
-		JSON.parse(val);
-	} catch (e) {
-		return false;
+		return JSON.parse(val);
+	} catch {
+		ctx.addIssue({
+			code: "custom",
+			message: "Invalid JSON string"
+		});
+		return z.NEVER;
 	}
-	return true;
-}, {
-	abort: true,
-	message: "Invalid JSON string"
-}).transform((val) => JSON.parse(val)).pipe(xResponseSchema);
+}).pipe(xResponseSchema);
 var XConnection = class XConnection {
 	constructor(args) {
 		this.responseHandler = null;
 		this.id = args.id;
 		this.socket = args.socket;
-		this.options = args.options ?? {};
+		this.debugOptions = args.debugOptions ?? null;
 		this.initListeners();
 	}
-	static async init(config, opts) {
+	static async init(config) {
 		const socket = new WebSocket(config.url);
 		const id = await new Promise((resolve, reject) => {
 			const timeoutID = setTimeout(() => abortHandshake(new UWError("CONNECTION_TIMEOUT")), config.connectionTimeout);
@@ -114,14 +121,14 @@ var XConnection = class XConnection {
 		return new XConnection({
 			id,
 			socket,
-			options: opts
+			debugOptions: config.debug
 		});
 	}
 	initListeners() {
 		this.socket.onopen = null;
 		this.socket.onmessage = (event) => {
 			if (this.responseHandler === null) {
-				this.options.debugHandlers?.onMessageEventDropped?.(event);
+				this.debugOptions?.handlers?.onMessageEventDropped?.(event);
 				return;
 			}
 			let resp;
@@ -148,7 +155,7 @@ var XConnection = class XConnection {
 		this.socket.onerror = null;
 		this.socket.onclose = (event) => {
 			if (this.responseHandler === null) {
-				this.options.debugHandlers?.onCloseEventDropped?.(event);
+				this.debugOptions?.handlers?.onCloseEventDropped?.(event);
 				return;
 			}
 			this.responseHandler.reject(newConnectionClosedError(event));
@@ -160,8 +167,8 @@ var XConnection = class XConnection {
 	get hasResponseHandler() {
 		return this.responseHandler !== null;
 	}
-	setResponseHandler(handler) {
-		this.responseHandler = handler;
+	setResponseHandler(respHandler) {
+		this.responseHandler = respHandler;
 	}
 	close() {
 		this.socket.close();
@@ -179,9 +186,10 @@ function safeParseXResponsePayload(data) {
 	};
 }
 function newUnexpectedXResponseTypeError(resp) {
-	let msg = `unexpected type: ${resp.type}`;
-	if (resp.type === "error") msg += ` (value: ${resp.value})`;
-	return new UWError("INVALID_RESPONSE", msg);
+	const msgs = [];
+	msgs.push(`unexpected type: ${resp.type}`);
+	if (resp.type === "error") msgs.push(`(value: ${resp.value})`);
+	return new UWError("INVALID_RESPONSE", msgs.join(" "));
 }
 function newConnectionClosedError(event) {
 	return new UWError("CONNECTION_CLOSED", event.reason.length > 0 ? event.reason : void 0);
@@ -199,14 +207,14 @@ var UnWallet = class UnWallet {
 		return new UnWallet({
 			env,
 			clientID: config.clientID,
-			xConnection: await XConnection.init(getUnWalletConfigByEnv(env).xAPI)
+			xConnection: await XConnection.init(envToUnWalletConfig[env].xAPI)
 		});
 	}
 	get unWalletConfig() {
-		return getUnWalletConfigByEnv(this.env);
+		return envToUnWalletConfig[this.env];
 	}
 	authorize(args) {
-		const url = new URL(`${this.unWalletConfig.frontend.baseURL}/${args.isVirtual === false ? "" : "v"}authorize`);
+		const url = new URL(`/${args.isVirtual === false ? "" : "v"}authorize`, this.unWalletConfig.frontend.origin);
 		url.searchParams.set("response_type", "id_token");
 		url.searchParams.set("response_mode", args.responseMode ?? "fragment");
 		url.searchParams.set("client_id", this.clientID);
@@ -216,90 +224,57 @@ var UnWallet = class UnWallet {
 		if (args.chainID !== void 0) url.searchParams.set("chain_id", args.chainID.toString());
 		location.assign(url);
 	}
-	sign(args) {
-		return new Promise((resolve, reject) => {
-			if (this.xConnection.readyState !== WebSocket.OPEN) {
-				reject(new UWError("CONNECTION_NOT_OPENED"));
-				return;
-			}
-			if (this.xConnection.hasResponseHandler) {
-				reject(new UWError("REQUEST_IN_PROGRESS"));
-				return;
-			}
-			const digest = sha256(toBytes(args.message));
-			this.xConnection.setResponseHandler({
-				resolve: (resp) => {
-					this.xConnection.setResponseHandler(null);
-					if (resp.type !== "signature") {
-						reject(newUnexpectedXResponseTypeError(resp));
-						return;
-					}
-					resolve({
-						digest,
-						signature: resp.value
-					});
-				},
-				reject: (err) => {
-					this.xConnection.setResponseHandler(null);
-					reject(err);
+	async sign(args) {
+		return {
+			digest: sha256(toBytes(args.message)),
+			signature: await this.request({
+				responseType: "signature",
+				path: "/x/sign",
+				params: {
+					message: args.message,
+					ticketToken: args.ticketToken
 				}
-			});
-			const url = new URL(`${this.unWalletConfig.frontend.baseURL}/x/sign`);
-			url.searchParams.set("connectionID", this.xConnection.id);
-			url.searchParams.set("clientID", this.clientID);
-			url.searchParams.set("message", args.message);
-			url.searchParams.set("ticketToken", args.ticketToken);
-			openWindow(url);
-		});
+			})
+		};
 	}
-	signEIP712TypedData(args) {
-		return new Promise((resolve, reject) => {
-			if (this.xConnection.readyState !== WebSocket.OPEN) {
-				reject(new UWError("CONNECTION_NOT_OPENED"));
-				return;
-			}
-			if (this.xConnection.hasResponseHandler) {
-				reject(new UWError("REQUEST_IN_PROGRESS"));
-				return;
-			}
-			const { EIP712Domain: _, ...typedDataTypes } = args.typedData.types;
-			const typedData = {
-				...args.typedData,
-				types: typedDataTypes
-			};
-			try {
-				validateTypedData(typedData);
-			} catch (e) {
-				reject(new UWError("INVALID_REQUEST", `invalid typed data: ${e instanceof BaseError ? e.shortMessage : String(e)}`));
-				return;
-			}
-			const digest = hashTypedData(typedData);
-			this.xConnection.setResponseHandler({
-				resolve: (resp) => {
-					this.xConnection.setResponseHandler(null);
-					if (resp.type !== "signature") {
-						reject(newUnexpectedXResponseTypeError(resp));
-						return;
-					}
-					resolve({
-						digest,
-						signature: resp.value
-					});
-				},
-				reject: (err) => {
-					this.xConnection.setResponseHandler(null);
-					reject(err);
+	async signEIP712TypedData(args) {
+		const { EIP712Domain: _, ...typedDataTypes } = args.typedData.types;
+		const typedData = {
+			...args.typedData,
+			types: typedDataTypes
+		};
+		try {
+			validateTypedData(typedData);
+		} catch (e) {
+			throw new UWError("INVALID_REQUEST", `invalid typed data: ${e instanceof BaseError ? e.shortMessage : String(e)}`);
+		}
+		return {
+			digest: hashTypedData(typedData),
+			signature: await this.request({
+				responseType: "signature",
+				path: "/x/signEIP712TypedData",
+				params: {
+					typedData: JSON.stringify(args.typedData),
+					ticketToken: args.ticketToken
 				}
-			});
-			const url = new URL(`${this.unWalletConfig.frontend.baseURL}/x/signEIP712TypedData`);
-			url.searchParams.set("connectionID", this.xConnection.id);
-			url.searchParams.set("clientID", this.clientID);
-			url.searchParams.set("typedData", JSON.stringify(args.typedData));
-			url.searchParams.set("ticketToken", args.ticketToken);
-			openWindow(url);
-		});
+			})
+		};
+	}
+	async sendTransaction(args) {
+		if (args.value === void 0 && args.data === void 0) throw new UWError("INVALID_REQUEST", "either value or data is required");
+		return { transactionID: await this.request({
+			responseType: "transactionID",
+			path: "/x/sendTransaction",
+			params: {
+				chainID: args.chainID.toString(),
+				toAddress: args.toAddress,
+				value: args.value ?? "0x0",
+				data: args.data ?? "0x",
+				ticketToken: args.ticketToken
+			}
+		}) };
 	}
-	sendTransaction(args) {
+	request(args) {
 		return new Promise((resolve, reject) => {
 			if (this.xConnection.readyState !== WebSocket.OPEN) {
 				reject(new UWError("CONNECTION_NOT_OPENED"));
@@ -309,44 +284,30 @@ var UnWallet = class UnWallet {
 				reject(new UWError("REQUEST_IN_PROGRESS"));
 				return;
 			}
-			if (args.value === void 0 && args.data === void 0) {
-				reject(new UWError("INVALID_REQUEST", "either value or data is required"));
-				return;
-			}
 			this.xConnection.setResponseHandler({
 				resolve: (resp) => {
 					this.xConnection.setResponseHandler(null);
-					if (resp.type !== "transactionID") {
+					if (resp.type !== args.responseType) {
 						reject(newUnexpectedXResponseTypeError(resp));
 						return;
 					}
-					resolve({ transactionID: resp.value });
+					resolve(resp.value);
 				},
 				reject: (err) => {
 					this.xConnection.setResponseHandler(null);
 					reject(err);
 				}
 			});
-			const url = new URL(`${this.unWalletConfig.frontend.baseURL}/x/sendTransaction`);
+			const url = new URL(args.path, this.unWalletConfig.frontend.origin);
 			url.searchParams.set("connectionID", this.xConnection.id);
 			url.searchParams.set("clientID", this.clientID);
-			url.searchParams.set("chainID", args.chainID.toString());
-			url.searchParams.set("toAddress", args.toAddress);
-			url.searchParams.set("value", args.value ?? "0x0");
-			url.searchParams.set("data", args.data ?? "0x");
-			url.searchParams.set("ticketToken", args.ticketToken);
-			openWindow(url);
+			for (const [key, value] of Object.entries(args.params)) url.searchParams.set(key, value);
+			window.open(url.toString());
 		});
 	}
 	close() {
 		this.xConnection.close();
 	}
 };
-function openWindow(url) {
-	const width = screen.width / 2;
-	const height = screen.height;
-	const left = screen.width / 4;
-	window.open(url.toString(), "_blank", `width=${width},height=${height},left=${left},top=0`);
-}
 //#endregion
 export { UWError, UnWallet };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unwallet-client-sdk",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "unWallet client-side SDK",
   "license": "MIT",
   "author": "SIVIRA",
@@ -29,7 +29,7 @@
     "url": "git+https://github.com/SIVIRA/unwallet-client-sdk-js.git"
   },
   "dependencies": {
-    "viem": "2.55.10",
+    "viem": "2.55.11",
     "zod": "4.4.3"
   },
   "devDependencies": {