@solana-mobile/mobile-wallet-adapter-protocol 2.2.7 → 2.2.9

package/lib/esm/index.js

@@ -1,5 +1,5 @@
+import { c as utf8FromUint8Array, d as base64ToBase58, f as encode, l as utf8ToUint8Array, m as toUint8Array, p as fromUint8Array, u as arrayBufferToBase64String } from "./chunks/encoding.js";
 import { createSignInMessageText } from "@solana/wallet-standard-util";
-import { getBase58Decoder } from "@solana/codecs-strings";
 //#region src/errors.ts
 const SolanaMobileWalletAdapterErrorCode = {
 	ERROR_ASSOCIATION_PORT_OUT_OF_RANGE: "ERROR_ASSOCIATION_PORT_OUT_OF_RANGE",
@@ -47,19 +47,6 @@ var SolanaMobileWalletAdapterProtocolError = class extends Error {
 	}
 };
 //#endregion
-//#region src/base64Utils.ts
-function encode(input) {
-	return window.btoa(input);
-}
-function fromUint8Array$1(byteArray, urlsafe) {
-	const base64 = window.btoa(String.fromCharCode.call(null, ...byteArray));
-	if (urlsafe) return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-	else return base64;
-}
-function toUint8Array(base64EncodedByteArray) {
-	return new Uint8Array(window.atob(base64EncodedByteArray).split("").map((c) => c.charCodeAt(0)));
-}
-//#endregion
 //#region src/createHelloReq.ts
 async function createHelloReq(ecdhPublicKey, associationKeypairPrivateKey) {
 	const publicKeyBuffer = await crypto.subtle.exportKey("raw", ecdhPublicKey);
@@ -86,14 +73,6 @@ const SolanaSignTransactions = "solana:signTransactions";
 const SolanaCloneAuthorization = "solana:cloneAuthorization";
 const SolanaSignInWithSolana = "solana:signInWithSolana";
 //#endregion
-//#region src/base58Utils.ts
-function fromUint8Array(byteArray) {
-	return getBase58Decoder().decode(byteArray);
-}
-function base64ToBase58(base64EncodedString) {
-	return fromUint8Array(toUint8Array(base64EncodedString));
-}
-//#endregion
 //#region src/createMobileWalletProxy.ts
 /**
 * Creates a {@link MobileWallet} proxy that handles backwards compatibility and API to RPC conversion.
@@ -109,7 +88,7 @@ function createMobileWalletProxy(protocolVersion, protocolRequestHandler) {
 			if (target[p] == null) target[p] = async function(inputParams) {
 				const { method, params } = handleMobileWalletRequest(p, inputParams, protocolVersion);
 				const result = await protocolRequestHandler(method, params);
-				if (method === "authorize" && params.sign_in_payload && !result.sign_in_result) result["sign_in_result"] = await signInFallback(params.sign_in_payload, result, protocolRequestHandler);
+				if (method === "authorize" && params.sign_in_payload && !result.sign_in_result) result.sign_in_result = await signInFallback(params.sign_in_payload, result, protocolRequestHandler);
 				return handleMobileWalletResponse(p, result, protocolVersion);
 			};
 			return target[p];
@@ -136,7 +115,8 @@ function handleMobileWalletRequest(methodName, methodParams, protocolVersion) {
 	let method = methodName.toString().replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`).toLowerCase();
 	switch (methodName) {
 		case "authorize": {
-			let { chain } = params;
+			const authorizeParams = params;
+			let { chain } = authorizeParams;
 			if (protocolVersion === "legacy") {
 				switch (chain) {
 					case "solana:testnet":
@@ -148,9 +128,10 @@ function handleMobileWalletRequest(methodName, methodParams, protocolVersion) {
 					case "solana:mainnet":
 						chain = "mainnet-beta";
 						break;
-					default: chain = params.cluster;
+					default: chain = authorizeParams.cluster;
 				}
-				params.cluster = chain;
+				authorizeParams.cluster = chain;
+				params = authorizeParams;
 			} else {
 				switch (chain) {
 					case "testnet":
@@ -161,7 +142,8 @@ function handleMobileWalletRequest(methodName, methodParams, protocolVersion) {
 						chain = "solana:mainnet";
 						break;
 				}
-				params.chain = chain;
+				authorizeParams.chain = chain;
+				params = authorizeParams;
 			}
 		}
 		case "reauthorize": {
@@ -229,8 +211,8 @@ async function signInFallback(signInPayload, authorizationResult, protocolReques
 		addresses: [address],
 		payloads: [siwsMessage]
 	})).signed_payloads[0]);
-	const signedMessage = fromUint8Array$1(signedPayload.slice(0, signedPayload.length - 64));
-	const signature = fromUint8Array$1(signedPayload.slice(signedPayload.length - 64));
+	const signedMessage = fromUint8Array(signedPayload.slice(0, signedPayload.length - 64));
+	const signature = fromUint8Array(signedPayload.slice(signedPayload.length - 64));
 	return {
 		address,
 		signed_message: signedMessage.length == 0 ? siwsMessage : signedMessage,
@@ -250,7 +232,7 @@ async function encryptMessage(plaintext, sequenceNumber, sharedSecret) {
 	const sequenceNumberVector = createSequenceNumberVector(sequenceNumber);
 	const initializationVector = new Uint8Array(INITIALIZATION_VECTOR_BYTES);
 	crypto.getRandomValues(initializationVector);
-	const ciphertext = await crypto.subtle.encrypt(getAlgorithmParams(sequenceNumberVector, initializationVector), sharedSecret, new TextEncoder().encode(plaintext));
+	const ciphertext = await crypto.subtle.encrypt(getAlgorithmParams(sequenceNumberVector, initializationVector), sharedSecret, utf8ToUint8Array(plaintext));
 	const response = new Uint8Array(sequenceNumberVector.byteLength + initializationVector.byteLength + ciphertext.byteLength);
 	response.set(new Uint8Array(sequenceNumberVector), 0);
 	response.set(new Uint8Array(initializationVector), sequenceNumberVector.byteLength);
@@ -262,7 +244,7 @@ async function decryptMessage(message, sharedSecret) {
 	const initializationVector = message.slice(4, 4 + INITIALIZATION_VECTOR_BYTES);
 	const ciphertext = message.slice(4 + INITIALIZATION_VECTOR_BYTES);
 	const plaintextBuffer = await crypto.subtle.decrypt(getAlgorithmParams(sequenceNumberVector, initializationVector), sharedSecret, ciphertext);
-	return getUtf8Decoder().decode(plaintextBuffer);
+	return utf8FromUint8Array(new Uint8Array(plaintextBuffer));
 }
 function getAlgorithmParams(sequenceNumber, initializationVector) {
 	return {
@@ -272,11 +254,6 @@ function getAlgorithmParams(sequenceNumber, initializationVector) {
 		tagLength: 128
 	};
 }
-let _utf8Decoder;
-function getUtf8Decoder() {
-	if (_utf8Decoder === void 0) _utf8Decoder = new TextDecoder("utf-8");
-	return _utf8Decoder;
-}
 //#endregion
 //#region src/generateAssociationKeypair.ts
 async function generateAssociationKeypair() {
@@ -294,15 +271,6 @@ async function generateECDHKeypair() {
 	}, false, ["deriveKey", "deriveBits"]);
 }
 //#endregion
-//#region src/arrayBufferToBase64String.ts
-function arrayBufferToBase64String(buffer) {
-	let binary = "";
-	const bytes = new Uint8Array(buffer);
-	const len = bytes.byteLength;
-	for (let ii = 0; ii < len; ii++) binary += String.fromCharCode(bytes[ii]);
-	return window.btoa(binary);
-}
-//#endregion
 //#region src/associationPort.ts
 function getRandomAssociationPort() {
 	return assertAssociationPort(49152 + Math.floor(Math.random() * 16384));
@@ -313,7 +281,7 @@ function assertAssociationPort(port) {
 }
 //#endregion
 //#region src/getStringWithURLUnsafeBase64CharactersReplaced.ts
-function getStringWithURLUnsafeCharactersReplaced(unsafeBase64EncodedString) {
+function getStringWithURLUnsafeBase64CharactersReplaced(unsafeBase64EncodedString) {
 	return unsafeBase64EncodedString.replace(/[/+=]/g, (m) => ({
 		"/": "_",
 		"+": "-",
@@ -342,7 +310,7 @@ async function getAssociateAndroidIntentURL(associationPublicKey, putativePort,
 	const associationPort = assertAssociationPort(putativePort);
 	const encodedKey = arrayBufferToBase64String(await crypto.subtle.exportKey("raw", associationPublicKey));
 	const url = getIntentURL("v1/associate/local", associationURLBase);
-	url.searchParams.set("association", getStringWithURLUnsafeCharactersReplaced(encodedKey));
+	url.searchParams.set("association", getStringWithURLUnsafeBase64CharactersReplaced(encodedKey));
 	url.searchParams.set("port", `${associationPort}`);
 	protocolVersions.forEach((version) => {
 		url.searchParams.set("v", version);
@@ -352,9 +320,9 @@ async function getAssociateAndroidIntentURL(associationPublicKey, putativePort,
 async function getRemoteAssociateAndroidIntentURL(associationPublicKey, hostAuthority, reflectorId, associationURLBase, protocolVersions = ["v1"]) {
 	const encodedKey = arrayBufferToBase64String(await crypto.subtle.exportKey("raw", associationPublicKey));
 	const url = getIntentURL("v1/associate/remote", associationURLBase);
-	url.searchParams.set("association", getStringWithURLUnsafeCharactersReplaced(encodedKey));
+	url.searchParams.set("association", getStringWithURLUnsafeBase64CharactersReplaced(encodedKey));
 	url.searchParams.set("reflector", `${hostAuthority}`);
-	url.searchParams.set("id", `${fromUint8Array$1(reflectorId, true)}`);
+	url.searchParams.set("id", `${fromUint8Array(reflectorId, true)}`);
 	protocolVersions.forEach((version) => {
 		url.searchParams.set("v", version);
 	});
@@ -468,7 +436,7 @@ async function launchAssociation(associationUrl) {
 			}
 			default: assertUnreachable(browser);
 		}
-	} catch (e) {
+	} catch {
 		throw new SolanaMobileWalletAdapterError(SolanaMobileWalletAdapterErrorCode.ERROR_WALLET_NOT_FOUND, "Found no installed wallet that supports the mobile wallet protocol.");
 	}
 }
@@ -510,7 +478,10 @@ function getSequenceNumberFromByteArray(byteArray) {
 	return new DataView(byteArray).getUint32(0, false);
 }
 function decodeVarLong(byteArray) {
-	var bytes = new Uint8Array(byteArray), l = byteArray.byteLength, limit = 10, value = 0, offset = 0, b;
+	const bytes = new Uint8Array(byteArray);
+	const l = byteArray.byteLength;
+	const limit = 10;
+	let value = 0, offset = 0, b;
 	do {
 		if (offset >= l || offset > limit) throw new RangeError("Failed to decode varint");
 		b = bytes[offset++];
@@ -522,7 +493,7 @@ function decodeVarLong(byteArray) {
 	};
 }
 function getReflectorIdFromByteArray(byteArray) {
-	let { value: length, offset } = decodeVarLong(byteArray);
+	const { value: length, offset } = decodeVarLong(byteArray);
 	return new Uint8Array(byteArray.slice(offset, offset + length));
 }
 async function transact(callback, config) {
@@ -589,7 +560,7 @@ async function startScenario(config) {
 			const handleMessage = async (evt) => {
 				const responseBuffer = await evt.data.arrayBuffer();
 				switch (state.__type) {
-					case "connecting":
+					case "connecting": {
 						if (responseBuffer.byteLength !== 0) throw new Error("Encountered unexpected message while connecting");
 						const ecdhKeypair = await generateECDHKeypair();
 						socket.send(await createHelloReq(ecdhKeypair.publicKey, associationKeypair.privateKey));
@@ -599,6 +570,7 @@ async function startScenario(config) {
 							ecdhPrivateKey: ecdhKeypair.privateKey
 						};
 						break;
+					}
 					case "connected":
 						try {
 							const sequenceNumber = getSequenceNumberFromByteArray(responseBuffer.slice(0, 4));
@@ -726,7 +698,7 @@ async function startRemoteScenario(config) {
 	let state = { __type: "disconnected" };
 	let socket;
 	let disposeSocket;
-	let decodeBytes = async (evt) => {
+	const decodeBytes = async (evt) => {
 		if (encoding == "base64") return toUint8Array(await evt.data).buffer;
 		else return await evt.data.arrayBuffer();
 	};
@@ -806,11 +778,11 @@ async function startRemoteScenario(config) {
 			const handleMessage = async (evt) => {
 				const responseBuffer = await decodeBytes(evt);
 				switch (state.__type) {
-					case "reflector_id_received":
+					case "reflector_id_received": {
 						if (responseBuffer.byteLength !== 0) throw new Error("Encountered unexpected message while awaiting reflection");
 						const ecdhKeypair = await generateECDHKeypair();
 						const binaryMsg = await createHelloReq(ecdhKeypair.publicKey, associationKeypair.privateKey);
-						if (encoding == "base64") socket.send(fromUint8Array$1(binaryMsg));
+						if (encoding == "base64") socket.send(fromUint8Array(binaryMsg));
 						else socket.send(binaryMsg);
 						state = {
 							__type: "hello_req_sent",
@@ -818,6 +790,7 @@ async function startRemoteScenario(config) {
 							ecdhPrivateKey: ecdhKeypair.privateKey
 						};
 						break;
+					}
 					case "connected":
 						try {
 							const sequenceNumber = getSequenceNumberFromByteArray(responseBuffer.slice(0, 4));
@@ -857,7 +830,7 @@ async function startRemoteScenario(config) {
 								method,
 								params: params ?? {}
 							}, sharedSecret);
-							if (encoding == "base64") socket.send(fromUint8Array$1(binaryMsg));
+							if (encoding == "base64") socket.send(fromUint8Array(binaryMsg));
 							else socket.send(binaryMsg);
 							return new Promise((resolve, reject) => {
 								jsonRpcResponsePromises[id] = {