@yeying-community/web3-bs 1.0.13 → 1.0.14

package/README.md

@@ -22,7 +22,7 @@ npm install @yeying-community/web3-bs
 
 - `getProvider` / `requireProvider`
 - `watchProvider`
-- `requestAccounts` / `focusPendingApproval` / `getAccounts` / `getPreferredAccount` / `watchAccounts`
+- `requestAccounts` / `focusPendingApproval` / `getAccounts` / `getPreferredAccount` / `resolveWalletAccount` / `watchAccounts`
 - `getChainId` / `getBalance`
 - `onAccountsChanged` / `onChainChanged`
 - `classifyWalletError` / `isUserRejectedWalletAction` / `isWalletReconnectError`
@@ -30,6 +30,14 @@ npm install @yeying-community/web3-bs
 `requestAccounts` 默认会复用同一 provider 上尚未完成的连接请求，避免用户重复点击时触发多个钱包授权弹窗。
 当钱包已经存在待确认的连接、签名或解锁窗口时，可调用 `focusPendingApproval` 将该窗口重新拉到前台，而不是再发起一次新的请求。
 
+`resolveWalletAccount` 用于处理“应用传入期望地址”和“钱包当前地址”之间的关系：
+- 未传 `expectedAccount`：直接采用钱包当前地址，返回 `status: "wallet"`
+- 传了且与钱包当前地址一致：返回 `status: "matched"`
+- 传了但与钱包当前地址不一致：返回 `status: "mismatch"`
+- 钱包当前没有可用地址：返回 `status: "unavailable"`
+
+它只返回结构化决策结果，不负责弹窗、toast 或业务状态写入，适合在登录、授权、签名前由应用自行决定是继续使用当前钱包地址，还是要求用户切换钱包账户。
+
 ### 2) SIWE + JWT
 
 - `signMessage`

package/dist/auth/provider.d.ts

@@ -1,4 +1,4 @@
-import { Eip1193Provider, ProviderDiscoveryOptions, ProviderInfo, RequestAccountsOptions, AccountSelection, PreferredAccountOptions, WatchAccountsOptions, AccountsChangedHandler, WatchProviderOptions, ProviderChangedHandler, WalletErrorInfo, FocusPendingApprovalResult } from './types';
+import { Eip1193Provider, ProviderDiscoveryOptions, ProviderInfo, RequestAccountsOptions, AccountSelection, PreferredAccountOptions, ResolveWalletAccountOptions, WalletAccountResolution, WatchAccountsOptions, AccountsChangedHandler, WatchProviderOptions, ProviderChangedHandler, WalletErrorInfo, FocusPendingApprovalResult } from './types';
 export declare function isYeYingProvider(provider?: Eip1193Provider | null, info?: ProviderInfo): boolean;
 export declare function getProvider(options?: ProviderDiscoveryOptions): Promise<Eip1193Provider | null>;
 export declare function watchProvider(handler: ProviderChangedHandler, options?: WatchProviderOptions): () => void;
@@ -13,6 +13,7 @@ export declare function focusPendingApproval(provider?: Eip1193Provider): Promis
 export declare function getAccounts(provider?: Eip1193Provider): Promise<string[]>;
 export declare function getChainId(provider?: Eip1193Provider): Promise<string | null>;
 export declare function getPreferredAccount(options?: PreferredAccountOptions): Promise<AccountSelection>;
+export declare function resolveWalletAccount(options?: ResolveWalletAccountOptions): Promise<WalletAccountResolution>;
 export declare function watchAccounts(provider: Eip1193Provider, handler: AccountsChangedHandler, options?: WatchAccountsOptions): () => void;
 export declare function getBalance(provider?: Eip1193Provider, address?: string, blockTag?: string): Promise<string>;
 export declare function onAccountsChanged(provider: Eip1193Provider, handler: (accounts: string[]) => void): () => void;

package/dist/auth/types.d.ts

@@ -67,6 +67,35 @@ export interface PreferredAccountOptions extends RequestAccountsOptions {
     autoConnect?: boolean;
     preferStored?: boolean;
 }
+export interface ResolveWalletAccountOptions extends RequestAccountsOptions {
+    expectedAccount?: string | null;
+    autoConnect?: boolean;
+}
+export type WalletAccountResolution = {
+    status: 'wallet';
+    account: string;
+    walletAccount: string;
+    expectedAccount: null;
+    accounts: string[];
+} | {
+    status: 'matched';
+    account: string;
+    walletAccount: string;
+    expectedAccount: string;
+    accounts: string[];
+} | {
+    status: 'mismatch';
+    account: null;
+    walletAccount: string;
+    expectedAccount: string;
+    accounts: string[];
+} | {
+    status: 'unavailable';
+    account: null;
+    walletAccount: null;
+    expectedAccount: string | null;
+    accounts: string[];
+};
 export interface WatchAccountsOptions {
     storageKey?: string;
     preferStored?: boolean;

package/dist/web3-bs.esm.js

@@ -73,6 +73,17 @@ function selectPreferredAccount(accounts, stored, preferStored) {
     }
     return accounts[0] || null;
 }
+function normalizeAccount(account) {
+    const normalized = (account || '').trim();
+    return normalized || null;
+}
+function isSameAccount(left, right) {
+    const normalizedLeft = normalizeAccount(left);
+    const normalizedRight = normalizeAccount(right);
+    return Boolean(normalizedLeft &&
+        normalizedRight &&
+        normalizedLeft.toLowerCase() === normalizedRight.toLowerCase());
+}
 function isYeYingProvider(provider, info) {
     if (!provider)
         return false;
@@ -336,6 +347,49 @@ async function getPreferredAccount(options = {}) {
     writeStoredAccount(storageKey, account);
     return { account, accounts };
 }
+async function resolveWalletAccount(options = {}) {
+    const provider = options.provider || (await requireProvider());
+    let accounts = await getAccounts(provider);
+    if (accounts.length === 0 && options.autoConnect) {
+        accounts = await requestAccounts({ provider });
+    }
+    const expectedAccount = normalizeAccount(options.expectedAccount);
+    const walletAccount = normalizeAccount(accounts[0]);
+    if (!walletAccount) {
+        return {
+            status: 'unavailable',
+            account: null,
+            walletAccount: null,
+            expectedAccount,
+            accounts,
+        };
+    }
+    if (!expectedAccount) {
+        return {
+            status: 'wallet',
+            account: walletAccount,
+            walletAccount,
+            expectedAccount: null,
+            accounts,
+        };
+    }
+    if (isSameAccount(expectedAccount, walletAccount)) {
+        return {
+            status: 'matched',
+            account: walletAccount,
+            walletAccount,
+            expectedAccount,
+            accounts,
+        };
+    }
+    return {
+        status: 'mismatch',
+        account: null,
+        walletAccount,
+        expectedAccount,
+        accounts,
+    };
+}
 function watchAccounts(provider, handler, options = {}) {
     const storageKey = options.storageKey || DEFAULT_ACCOUNT_STORAGE_KEY;
     const preferStored = options.preferStored !== false;
@@ -2471,5 +2525,5 @@ async function initDappSession(options) {
     return result;
 }
 
-export { CipherError, DEFAULT_UCAN_SESSION_TTL_MS, DEFAULT_UCAN_TOKEN_SKEW_MS, DEFAULT_UCAN_TOKEN_TTL_MS, WebDavClient, authCentralUcanFetch, authFetch, authUcanFetch, base64ToBytes, bytesToBase64, classifyUcanAuthError, classifyWalletError, clearAccessToken, clearCentralSessionToken, clearUcanSession, createAndIssueCentralUcan, createCentralSession, createDelegationUcan, createInvocationUcan, createRootUcan, createUcanSession, createWebDavClient, decodeUcanPayload, decrypt, deriveAppIdFromHost, deriveAppIdFromLocation, encrypt, focusPendingApproval, getAccessToken, getAccounts, getBalance, getCapabilityAction, getCapabilityResource, getCentralIssuerInfo, getCentralSessionToken, getChainId, getOrCreateInvocationUcan, getOrCreateUcanRoot, getPreferredAccount, getProvider, getStoredUcanRoot, getSupportedCipherSuites, getUcanSession, getUcanTokenTiming, getWalletErrorCode, getWalletErrorMessage, initDappSession, initWebDavStorage, isUcanTokenFresh, isUserRejectedWalletAction, isWalletReconnectError, isYeYingProvider, issueCentralUcan, loginWithChallenge, logout, normalizeAppHostnameForAppId, normalizeUcanCapabilities, normalizeUcanCapability, normalizeUcanExpiry, onAccountsChanged, onChainChanged, refreshAccessToken, requestAccounts, requireProvider, setAccessToken, setCentralSessionToken, signMessage, storeUcanRoot, watchAccounts, watchProvider };
+export { CipherError, DEFAULT_UCAN_SESSION_TTL_MS, DEFAULT_UCAN_TOKEN_SKEW_MS, DEFAULT_UCAN_TOKEN_TTL_MS, WebDavClient, authCentralUcanFetch, authFetch, authUcanFetch, base64ToBytes, bytesToBase64, classifyUcanAuthError, classifyWalletError, clearAccessToken, clearCentralSessionToken, clearUcanSession, createAndIssueCentralUcan, createCentralSession, createDelegationUcan, createInvocationUcan, createRootUcan, createUcanSession, createWebDavClient, decodeUcanPayload, decrypt, deriveAppIdFromHost, deriveAppIdFromLocation, encrypt, focusPendingApproval, getAccessToken, getAccounts, getBalance, getCapabilityAction, getCapabilityResource, getCentralIssuerInfo, getCentralSessionToken, getChainId, getOrCreateInvocationUcan, getOrCreateUcanRoot, getPreferredAccount, getProvider, getStoredUcanRoot, getSupportedCipherSuites, getUcanSession, getUcanTokenTiming, getWalletErrorCode, getWalletErrorMessage, initDappSession, initWebDavStorage, isUcanTokenFresh, isUserRejectedWalletAction, isWalletReconnectError, isYeYingProvider, issueCentralUcan, loginWithChallenge, logout, normalizeAppHostnameForAppId, normalizeUcanCapabilities, normalizeUcanCapability, normalizeUcanExpiry, onAccountsChanged, onChainChanged, refreshAccessToken, requestAccounts, requireProvider, resolveWalletAccount, setAccessToken, setCentralSessionToken, signMessage, storeUcanRoot, watchAccounts, watchProvider };
 //# sourceMappingURL=web3-bs.esm.js.map