@solana-mobile/mobile-wallet-adapter-protocol 2.2.0-new-arch-beta → 2.2.0

package/lib/types/index.d.ts

@@ -11,6 +11,7 @@ declare const SolanaMobileWalletAdapterErrorCode: {
     readonly ERROR_SESSION_TIMEOUT: "ERROR_SESSION_TIMEOUT";
     readonly ERROR_WALLET_NOT_FOUND: "ERROR_WALLET_NOT_FOUND";
     readonly ERROR_INVALID_PROTOCOL_VERSION: "ERROR_INVALID_PROTOCOL_VERSION";
+    readonly ERROR_BROWSER_NOT_SUPPORTED: "ERROR_BROWSER_NOT_SUPPORTED";
 };
 type SolanaMobileWalletAdapterErrorCodeEnum = (typeof SolanaMobileWalletAdapterErrorCode)[keyof typeof SolanaMobileWalletAdapterErrorCode];
 type ErrorDataTypeMap = {
@@ -28,6 +29,7 @@ type ErrorDataTypeMap = {
     [SolanaMobileWalletAdapterErrorCode.ERROR_SESSION_TIMEOUT]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_WALLET_NOT_FOUND]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION]: undefined;
+    [SolanaMobileWalletAdapterErrorCode.ERROR_BROWSER_NOT_SUPPORTED]: undefined;
 };
 declare class SolanaMobileWalletAdapterError<TErrorCode extends SolanaMobileWalletAdapterErrorCodeEnum> extends Error {
     data: ErrorDataTypeMap[TErrorCode] | undefined;
@@ -248,10 +250,14 @@ type SignInResult = Readonly<{
     signature: Base64EncodedAddress;
     signature_type?: string;
 }>;
-declare function transact<TReturn>(callback: (wallet: MobileWallet) => TReturn, config?: WalletAssociationConfig): Promise<TReturn>;
-declare function transactRemote<TReturn>(callback: (wallet: RemoteMobileWallet) => TReturn, config: RemoteWalletAssociationConfig): Promise<{
+type Scenario = Readonly<{
+    wallet: Promise<MobileWallet>;
+    close: () => void;
+}>;
+type RemoteScenario = Scenario & Readonly<{
     associationUrl: URL;
-    result: Promise<TReturn>;
 }>;
-export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, transactRemote, Account, AppIdentity, AssociationKeypair, ProtocolVersion, SessionProperties, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Chain, Finality, WalletAssociationConfig, RemoteWalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet, TerminateSessionAPI, RemoteMobileWallet, SolanaSignTransactions, SolanaCloneAuthorization, SolanaSignInWithSolana, SignInPayload, SignInPayloadWithRequiredFields, SignInResult };
+declare function transact<TReturn>(callback: (wallet: MobileWallet) => TReturn, config?: WalletAssociationConfig): Promise<TReturn>;
+declare function startRemoteScenario(config: RemoteWalletAssociationConfig): Promise<RemoteScenario>;
+export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, startRemoteScenario, Account, AppIdentity, AssociationKeypair, ProtocolVersion, SessionProperties, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Chain, Finality, WalletAssociationConfig, RemoteWalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet, TerminateSessionAPI, RemoteMobileWallet, SolanaSignTransactions, SolanaCloneAuthorization, SolanaSignInWithSolana, SignInPayload, SignInPayloadWithRequiredFields, SignInResult, Scenario, RemoteScenario };
 //# sourceMappingURL=index.d.ts.map

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/base64Utils.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/associationPort.ts","../../src/arrayBufferToBase64String.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/reflectorId.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/startSession.ts","../../src/transact.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/base64Utils.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/arrayBufferToBase64String.ts","../../src/associationPort.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/startSession.ts","../../src/transact.ts"],"names":[],"mappings":""}

package/lib/types/index.native.d.ts

@@ -11,6 +11,7 @@ declare const SolanaMobileWalletAdapterErrorCode: {
     readonly ERROR_SESSION_TIMEOUT: "ERROR_SESSION_TIMEOUT";
     readonly ERROR_WALLET_NOT_FOUND: "ERROR_WALLET_NOT_FOUND";
     readonly ERROR_INVALID_PROTOCOL_VERSION: "ERROR_INVALID_PROTOCOL_VERSION";
+    readonly ERROR_BROWSER_NOT_SUPPORTED: "ERROR_BROWSER_NOT_SUPPORTED";
 };
 type SolanaMobileWalletAdapterErrorCodeEnum = (typeof SolanaMobileWalletAdapterErrorCode)[keyof typeof SolanaMobileWalletAdapterErrorCode];
 type ErrorDataTypeMap = {
@@ -28,6 +29,7 @@ type ErrorDataTypeMap = {
     [SolanaMobileWalletAdapterErrorCode.ERROR_SESSION_TIMEOUT]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_WALLET_NOT_FOUND]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION]: undefined;
+    [SolanaMobileWalletAdapterErrorCode.ERROR_BROWSER_NOT_SUPPORTED]: undefined;
 };
 declare class SolanaMobileWalletAdapterError<TErrorCode extends SolanaMobileWalletAdapterErrorCodeEnum> extends Error {
     data: ErrorDataTypeMap[TErrorCode] | undefined;
@@ -248,10 +250,14 @@ type SignInResult = Readonly<{
     signature: Base64EncodedAddress;
     signature_type?: string;
 }>;
-declare function transact<TReturn>(callback: (wallet: MobileWallet) => TReturn, config?: WalletAssociationConfig): Promise<TReturn>;
-declare function transactRemote<TReturn>(callback: (wallet: RemoteMobileWallet) => TReturn, config: RemoteWalletAssociationConfig): Promise<{
+type Scenario = Readonly<{
+    wallet: Promise<MobileWallet>;
+    close: () => void;
+}>;
+type RemoteScenario = Scenario & Readonly<{
     associationUrl: URL;
-    result: Promise<TReturn>;
 }>;
-export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, transactRemote, Account, AppIdentity, AssociationKeypair, ProtocolVersion, SessionProperties, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Chain, Finality, WalletAssociationConfig, RemoteWalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet, TerminateSessionAPI, RemoteMobileWallet, SolanaSignTransactions, SolanaCloneAuthorization, SolanaSignInWithSolana, SignInPayload, SignInPayloadWithRequiredFields, SignInResult };
+declare function transact<TReturn>(callback: (wallet: MobileWallet) => TReturn, config?: WalletAssociationConfig): Promise<TReturn>;
+declare function startRemoteScenario(config: RemoteWalletAssociationConfig): Promise<RemoteScenario>;
+export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, startRemoteScenario, Account, AppIdentity, AssociationKeypair, ProtocolVersion, SessionProperties, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Chain, Finality, WalletAssociationConfig, RemoteWalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet, TerminateSessionAPI, RemoteMobileWallet, SolanaSignTransactions, SolanaCloneAuthorization, SolanaSignInWithSolana, SignInPayload, SignInPayloadWithRequiredFields, SignInResult, Scenario, RemoteScenario };
 //# sourceMappingURL=index.native.d.ts.map

package/lib/types/index.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/base64Utils.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/associationPort.ts","../../src/arrayBufferToBase64String.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/reflectorId.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/startSession.ts","../../src/transact.ts","../../src/codegenSpec/NativeSolanaMobileWalletAdapter.ts","../../src/__forks__/react-native/transact.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/base64Utils.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/arrayBufferToBase64String.ts","../../src/associationPort.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/startSession.ts","../../src/transact.ts","../../src/codegenSpec/NativeSolanaMobileWalletAdapter.ts","../../src/__forks__/react-native/transact.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,66 +1,71 @@
-{
-    "name": "@solana-mobile/mobile-wallet-adapter-protocol",
-    "description": "An implementation of the Solana Mobile Mobile Wallet Adapter protocol. Use this to open a session with a mobile wallet app, and to issue API calls to it.",
-    "version": "2.2.0-new-arch-beta",
-    "author": "Steven Luscher <steven.luscher@solanamobile.com>",
-    "repository": "https://github.com/solana-mobile/mobile-wallet-adapter",
-    "license": "Apache-2.0",
-    "type": "module",
-    "sideEffects": false,
-    "main": "lib/cjs/index.js",
-    "react-native": "lib/cjs/index.native.js",
-    "module": "lib/esm/index.js",
-    "types": "lib/types/index.d.ts",
-    "browser": {
-        "./lib/cjs/index.js": "./lib/cjs/index.browser.js",
-        "./lib/esm/index.js": "./lib/esm/index.browser.js"
-    },
-    "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./lib/esm/index.js",
-            "require": "./lib/cjs/index.js"
-        }
-    },
-    "files": [
-        "android",
-        "!android/build",
-        "lib",
-        "LICENSE"
-    ],
-    "publishConfig": {
-        "access": "public"
-    },
-    "scripts": {
-        "clean": "shx rm -rf lib/*",
-        "build": "yarn clean && rollup --config ../../rollup.config.ts --configPlugin rollup-plugin-ts",
-        "build:watch": "yarn clean && rollup --config ../../rollup.config.ts --configPlugin rollup-plugin-ts --watch",
-        "postbuild": "cross-env echo {\\\"type\\\":\\\"commonjs\\\"} | npx json > lib/cjs/package.json && echo {\\\"type\\\":\\\"module\\\"} | npx json > lib/esm/package.json",
-        "prepublishOnly": "agadoo"
-    },
-    "dependencies": {
-        "@solana/wallet-standard": "^1.1.2",
-        "@solana/wallet-standard-util": "^1.1.1",
-        "@wallet-standard/core": "^1.0.3",
-        "js-base64": "^3.7.5"
-    },
-    "devDependencies": {
-        "@solana/web3.js": "^1.91.7",
-        "@types/react-native": "^0.69.3",
-        "agadoo": "^3.0.0",
-        "cross-env": "^7.0.3",
-        "shx": "^0.3.4"
-    },
-    "peerDependencies": {
-        "@solana/web3.js": "^1.58.0",
-        "react-native": ">0.69"
-    },
-    "codegenConfig": {
-        "name": "SolanaMobileWalletAdapter",
-        "type": "all",
-        "jsSrcsDir": "./src/codegenSpec",
-        "android": {
-            "javaPackageName": "com.solanamobile.mobilewalletadapter.reactnative"
-        }
-    }
-}
+{
+    "name": "@solana-mobile/mobile-wallet-adapter-protocol",
+    "description": "An implementation of the Solana Mobile Mobile Wallet Adapter protocol. Use this to open a session with a mobile wallet app, and to issue API calls to it.",
+    "version": "2.2.0",
+    "author": "Steven Luscher <steven.luscher@solanamobile.com>",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/solana-mobile/mobile-wallet-adapter.git"
+    },
+    "license": "Apache-2.0",
+    "type": "module",
+    "sideEffects": false,
+    "main": "lib/cjs/index.js",
+    "react-native": "lib/cjs/index.native.js",
+    "module": "lib/esm/index.js",
+    "types": "lib/types/index.d.ts",
+    "browser": {
+        "./lib/cjs/index.js": "./lib/cjs/index.browser.js",
+        "./lib/esm/index.js": "./lib/esm/index.browser.js"
+    },
+    "exports": {
+        "./package.json": "./package.json",
+        ".": {
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js",
+            "types": "./lib/types/index.d.ts"
+        }
+    },
+    "files": [
+        "android",
+        "src/codegenSpec",
+        "!android/build",
+        "lib",
+        "LICENSE"
+    ],
+    "publishConfig": {
+        "access": "public"
+    },
+    "scripts": {
+        "clean": "shx rm -rf lib/*",
+        "build": "yarn clean && rollup --config ../../rollup.config.ts --configPlugin rollup-plugin-ts",
+        "build:watch": "yarn clean && rollup --config ../../rollup.config.ts --configPlugin rollup-plugin-ts --watch",
+        "postbuild": "cross-env echo {\\\"type\\\":\\\"commonjs\\\"} | npx json > lib/cjs/package.json && echo {\\\"type\\\":\\\"module\\\"} | npx json > lib/esm/package.json",
+        "prepublishOnly": "agadoo"
+    },
+    "dependencies": {
+        "@solana/wallet-standard": "^1.1.2",
+        "@solana/wallet-standard-util": "^1.1.1",
+        "@wallet-standard/core": "^1.0.3",
+        "js-base64": "^3.7.5"
+    },
+    "devDependencies": {
+        "@solana/web3.js": "^1.91.7",
+        "@types/react-native": "^0.69.3",
+        "agadoo": "^3.0.0",
+        "cross-env": "^7.0.3",
+        "shx": "^0.3.4"
+    },
+    "peerDependencies": {
+        "@solana/web3.js": "^1.58.0",
+        "react-native": ">0.69"
+    },
+    "codegenConfig": {
+        "name": "SolanaMobileWalletAdapter",
+        "type": "all",
+        "jsSrcsDir": "./src/codegenSpec",
+        "android": {
+            "javaPackageName": "com.solanamobile.mobilewalletadapter.reactnative"
+        }
+    }
+}

package/src/__forks__/react-native/base64Utils.ts

@@ -1 +1 @@
-export { encode } from 'js-base64';
+export { encode, fromUint8Array, toUint8Array } from 'js-base64';

package/src/__forks__/react-native/transact.ts

@@ -1,91 +1,91 @@
-import { Platform } from 'react-native';
-
-import NativeSolanaMobileWalletAdapter from '../../codegenSpec/NativeSolanaMobileWalletAdapter.js';
-import createMobileWalletProxy from '../../createMobileWalletProxy.js';
-import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolError } from '../../errors.js';
-import { MobileWallet, SessionProperties, WalletAssociationConfig } from '../../types.js';
-
-type ReactNativeError = Error & { code?: string; userInfo?: Record<string, unknown> };
-
-const LINKING_ERROR =
-    `The package 'solana-mobile-wallet-adapter-protocol' doesn't seem to be linked. Make sure: \n\n` +
-    '- You rebuilt the app after installing the package\n' +
-    '- If you are using Lerna workspaces\n' +
-    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` as an explicit dependency, and\n' +
-    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` to the `nohoist` section of your package.json\n' +
-    '- You are not using Expo managed workflow\n';
-
-const SolanaMobileWalletAdapter =
-    Platform.OS === 'android' && NativeSolanaMobileWalletAdapter
-        ? NativeSolanaMobileWalletAdapter
-        : (new Proxy(
-              {},
-              {
-                  get() {
-                      throw new Error(
-                          Platform.OS !== 'android'
-                              ? 'The package `solana-mobile-wallet-adapter-protocol` is only compatible with React Native Android'
-                              : LINKING_ERROR,
-                      );
-                  },
-              },
-          ) as typeof NativeSolanaMobileWalletAdapter);
-
-function getErrorMessage(e: ReactNativeError): string {
-    switch (e.code) {
-        case 'ERROR_WALLET_NOT_FOUND':
-            return 'Found no installed wallet that supports the mobile wallet protocol.';
-        default:
-            return e.message;
-    }
-}
-
-function handleError(e: any): never {
-    if (e instanceof Error) {
-        const reactNativeError: ReactNativeError = e;
-        switch (reactNativeError.code) {
-            case undefined:
-                throw e;
-            case 'JSON_RPC_ERROR': {
-                const details = reactNativeError.userInfo as Readonly<{ jsonRpcErrorCode: number }>;
-                throw new SolanaMobileWalletAdapterProtocolError(
-                    0 /* jsonRpcMessageId */,
-                    details.jsonRpcErrorCode,
-                    e.message,
-                );
-            }
-            default:
-                throw new SolanaMobileWalletAdapterError<any>(
-                    reactNativeError.code,
-                    getErrorMessage(reactNativeError),
-                    reactNativeError.userInfo,
-                );
-        }
-    }
-    throw e;
-}
-
-export async function transact<TReturn>(
-    callback: (wallet: MobileWallet) => TReturn,
-    config?: WalletAssociationConfig,
-): Promise<TReturn> {
-    let didSuccessfullyConnect = false;
-    try {
-        const sessionProperties: SessionProperties = await SolanaMobileWalletAdapter.startSession(config);
-        didSuccessfullyConnect = true;
-        const wallet = createMobileWalletProxy(sessionProperties.protocol_version, async (method, params) => {
-            try {
-                return SolanaMobileWalletAdapter.invoke(method, params);
-            } catch (e) {
-                return handleError(e);
-            }
-        });
-        return await callback(wallet);
-    } catch (e) {
-        return handleError(e);
-    } finally {
-        if (didSuccessfullyConnect) {
-            await SolanaMobileWalletAdapter.endSession();
-        }
-    }
-}
+import { Platform } from 'react-native';
+
+import NativeSolanaMobileWalletAdapter from '../../codegenSpec/NativeSolanaMobileWalletAdapter.js';
+import createMobileWalletProxy from '../../createMobileWalletProxy.js';
+import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolError } from '../../errors.js';
+import { MobileWallet, SessionProperties, WalletAssociationConfig } from '../../types.js';
+
+type ReactNativeError = Error & { code?: string; userInfo?: Record<string, unknown> };
+
+const LINKING_ERROR =
+    `The package 'solana-mobile-wallet-adapter-protocol' doesn't seem to be linked. Make sure: \n\n` +
+    '- You rebuilt the app after installing the package\n' +
+    '- If you are using Lerna workspaces\n' +
+    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` as an explicit dependency, and\n' +
+    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` to the `nohoist` section of your package.json\n' +
+    '- You are not using Expo managed workflow\n';
+
+const SolanaMobileWalletAdapter =
+    Platform.OS === 'android' && NativeSolanaMobileWalletAdapter
+        ? NativeSolanaMobileWalletAdapter
+        : (new Proxy(
+              {},
+              {
+                  get() {
+                      throw new Error(
+                          Platform.OS !== 'android'
+                              ? 'The package `solana-mobile-wallet-adapter-protocol` is only compatible with React Native Android'
+                              : LINKING_ERROR,
+                      );
+                  },
+              },
+          ) as typeof NativeSolanaMobileWalletAdapter);
+
+function getErrorMessage(e: ReactNativeError): string {
+    switch (e.code) {
+        case 'ERROR_WALLET_NOT_FOUND':
+            return 'Found no installed wallet that supports the mobile wallet protocol.';
+        default:
+            return e.message;
+    }
+}
+
+function handleError(e: any): never {
+    if (e instanceof Error) {
+        const reactNativeError: ReactNativeError = e;
+        switch (reactNativeError.code) {
+            case undefined:
+                throw e;
+            case 'JSON_RPC_ERROR': {
+                const details = reactNativeError.userInfo as Readonly<{ jsonRpcErrorCode: number }>;
+                throw new SolanaMobileWalletAdapterProtocolError(
+                    0 /* jsonRpcMessageId */,
+                    details.jsonRpcErrorCode,
+                    e.message,
+                );
+            }
+            default:
+                throw new SolanaMobileWalletAdapterError<any>(
+                    reactNativeError.code,
+                    getErrorMessage(reactNativeError),
+                    reactNativeError.userInfo,
+                );
+        }
+    }
+    throw e;
+}
+
+export async function transact<TReturn>(
+    callback: (wallet: MobileWallet) => TReturn,
+    config?: WalletAssociationConfig,
+): Promise<TReturn> {
+    let didSuccessfullyConnect = false;
+    try {
+        const sessionProperties: SessionProperties = await SolanaMobileWalletAdapter.startSession(config);
+        didSuccessfullyConnect = true;
+        const wallet = createMobileWalletProxy(sessionProperties.protocol_version, async (method, params) => {
+            try {
+                return SolanaMobileWalletAdapter.invoke(method, params);
+            } catch (e) {
+                return handleError(e);
+            }
+        });
+        return await callback(wallet);
+    } catch (e) {
+        return handleError(e);
+    } finally {
+        if (didSuccessfullyConnect) {
+            await SolanaMobileWalletAdapter.endSession();
+        }
+    }
+}

package/src/base64Utils.ts

@@ -1,3 +1,22 @@
 export function encode(input: string): string {
     return window.btoa(input);
+}
+
+export function fromUint8Array(byteArray: Uint8Array, urlsafe?: boolean): string {
+    const base64 = window.btoa(String.fromCharCode.call(null, ...byteArray));
+    if (urlsafe) {
+        return base64
+            .replace(/\+/g, '-')
+            .replace(/\//g, '_')
+            .replace(/=+$/, '');
+    } else return base64;
+}
+
+export function toUint8Array(base64EncodedByteArray: string): Uint8Array {
+    return new Uint8Array(
+        window
+            .atob(base64EncodedByteArray)
+            .split('')
+            .map((c) => c.charCodeAt(0)),
+    );
 }

package/src/codegenSpec/NativeSolanaMobileWalletAdapter.ts

@@ -1,13 +1,13 @@
-import { TurboModule, TurboModuleRegistry } from 'react-native';
-
-export interface Spec extends TurboModule {
-    startSession(config?: { baseUri?: string }): Promise<{
-        protocol_version: 'legacy' | 'v1';
-    }>;
-
-    invoke(method: string, params: Object | undefined): Promise<Object>;
-
-    endSession(): Promise<boolean>;
-}
-
-export default TurboModuleRegistry.getEnforcing<Spec>('SolanaMobileWalletAdapter') as Spec;
+import { TurboModule, TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+    startSession(config?: { baseUri?: string }): Promise<{
+        protocol_version: 'legacy' | 'v1';
+    }>;
+
+    invoke(method: string, params: Object | undefined): Promise<Object>;
+
+    endSession(): Promise<boolean>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SolanaMobileWalletAdapter') as Spec;

package/src/createMobileWalletProxy.ts

@@ -26,6 +26,13 @@ export default function createMobileWalletProxy<
 ): MobileWallet {
     return new Proxy<MobileWallet>({} as MobileWallet, {
         get<TMethodName extends keyof MobileWallet>(target: MobileWallet, p: TMethodName) {
+            // Wrapping a Proxy in a promise results in the Proxy being asked for a 'then' property so must 
+            // return null if 'then' is called on this proxy to let the 'resolve()' call know this is not a promise.
+            // see: https://stackoverflow.com/a/53890904
+            //@ts-ignore
+            if (p === 'then') { 
+                return null;
+            }
             if (target[p] == null) {
                 target[p] = async function (inputParams: Parameters<MobileWallet[TMethodName]>[0]) {
                     const { method, params } = handleMobileWalletRequest(p, inputParams, protocolVersion);

package/src/errors.ts

@@ -8,6 +8,7 @@ export const SolanaMobileWalletAdapterErrorCode = {
     ERROR_SESSION_TIMEOUT: 'ERROR_SESSION_TIMEOUT',
     ERROR_WALLET_NOT_FOUND: 'ERROR_WALLET_NOT_FOUND',
     ERROR_INVALID_PROTOCOL_VERSION: 'ERROR_INVALID_PROTOCOL_VERSION',
+    ERROR_BROWSER_NOT_SUPPORTED: 'ERROR_BROWSER_NOT_SUPPORTED',
 } as const;
 type SolanaMobileWalletAdapterErrorCodeEnum =
     typeof SolanaMobileWalletAdapterErrorCode[keyof typeof SolanaMobileWalletAdapterErrorCode];
@@ -27,6 +28,7 @@ type ErrorDataTypeMap = {
     [SolanaMobileWalletAdapterErrorCode.ERROR_SESSION_TIMEOUT]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_WALLET_NOT_FOUND]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION]: undefined;
+    [SolanaMobileWalletAdapterErrorCode.ERROR_BROWSER_NOT_SUPPORTED]: undefined;
 };
 
 export class SolanaMobileWalletAdapterError<TErrorCode extends SolanaMobileWalletAdapterErrorCodeEnum> extends Error {

package/src/getAssociateAndroidIntentURL.ts

@@ -2,8 +2,8 @@ import arrayBufferToBase64String from './arrayBufferToBase64String.js';
 import { assertAssociationPort } from './associationPort.js';
 import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterErrorCode } from './errors.js';
 import getStringWithURLUnsafeBase64CharactersReplaced from './getStringWithURLUnsafeBase64CharactersReplaced.js';
-import { assertReflectorId } from './reflectorId.js';
 import { ProtocolVersion } from './types.js';
+import { fromUint8Array } from './base64Utils.js';
 
 const INTENT_NAME = 'solana-wallet';
 
@@ -60,17 +60,16 @@ export default async function getAssociateAndroidIntentURL(
 export async function getRemoteAssociateAndroidIntentURL(
     associationPublicKey: CryptoKey,
     hostAuthority: string,
-    putativeId: number,
+    reflectorId: Uint8Array,
     associationURLBase?: string,
     protocolVersions: ProtocolVersion[] = ['v1'],
 ): Promise<URL> {
-    const reflectorId = assertReflectorId(putativeId);
     const exportedKey = await crypto.subtle.exportKey('raw', associationPublicKey);
     const encodedKey = arrayBufferToBase64String(exportedKey);
     const url = getIntentURL('v1/associate/remote', associationURLBase);
     url.searchParams.set('association', getStringWithURLUnsafeBase64CharactersReplaced(encodedKey));
     url.searchParams.set('reflector', `${hostAuthority}`);
-    url.searchParams.set('id', `${reflectorId}`);
+    url.searchParams.set('id', `${fromUint8Array(reflectorId, true)}`);
     protocolVersions.forEach( (version) => {
         url.searchParams.set('v', version);
     })

package/src/startSession.ts

@@ -1,7 +1,6 @@
 import { AssociationPort, getRandomAssociationPort } from './associationPort.js';
 import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterErrorCode } from './errors.js';
-import getAssociateAndroidIntentURL, { getRemoteAssociateAndroidIntentURL } from './getAssociateAndroidIntentURL.js';
-import { assertReflectorId, getRandomReflectorId, ReflectorId } from './reflectorId.js';
+import getAssociateAndroidIntentURL from './getAssociateAndroidIntentURL.js';
 
 // Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
 const Browser = {
@@ -35,7 +34,7 @@ function getDetectionPromise() {
         const timeoutId = setTimeout(() => {
             cleanup();
             reject();
-        }, 2000);
+        }, 3000);
     });
 }
 
@@ -96,35 +95,4 @@ export async function startSession(
     );
     await launchAssociation(associationUrl);
     return randomAssociationPort;
-}
-
-export async function startRemoteSession(
-    associationPublicKey: CryptoKey,
-    hostAuthority: string,
-    associationURLBase?: string,
-): Promise<ReflectorId> {
-    const randomReflectorId = getRandomReflectorId();
-    const associationUrl = await getRemoteAssociateAndroidIntentURL(
-        associationPublicKey,
-        hostAuthority,
-        randomReflectorId,
-        associationURLBase,
-    );
-    await launchAssociation(associationUrl);
-    return randomReflectorId;
-}
-
-export async function getRemoteSessionUrl(
-    associationPublicKey: CryptoKey,
-    hostAuthority: string,
-    associationURLBase?: string,
-): Promise<{associationUrl: URL, reflectorId: ReflectorId }> {
-    const randomReflectorId = getRandomReflectorId();
-    const associationUrl = await getRemoteAssociateAndroidIntentURL(
-        associationPublicKey,
-        hostAuthority,
-        randomReflectorId,
-        associationURLBase,
-    );
-    return { associationUrl, reflectorId: randomReflectorId };
 }