@yeying-community/web3-bs 1.0.10 → 1.0.11

package/README.md

@@ -22,12 +22,13 @@ npm install @yeying-community/web3-bs
 
 - `getProvider` / `requireProvider`
 - `watchProvider`
-- `requestAccounts` / `getAccounts` / `getPreferredAccount` / `watchAccounts`
+- `requestAccounts` / `focusPendingApproval` / `getAccounts` / `getPreferredAccount` / `watchAccounts`
 - `getChainId` / `getBalance`
 - `onAccountsChanged` / `onChainChanged`
 - `classifyWalletError` / `isUserRejectedWalletAction` / `isWalletReconnectError`
 
 `requestAccounts` 默认会复用同一 provider 上尚未完成的连接请求，避免用户重复点击时触发多个钱包授权弹窗。
+当钱包已经存在待确认的连接、签名或解锁窗口时，可调用 `focusPendingApproval` 将该窗口重新拉到前台，而不是再发起一次新的请求。
 
 ### 2) SIWE + JWT
 
@@ -72,7 +73,17 @@ npm install @yeying-community/web3-bs
 ### 单后端登录（SIWE + JWT）
 
 ```ts
-import { loginWithChallenge, authFetch } from '@yeying-community/web3-bs';
+import {
+  authFetch,
+  focusPendingApproval,
+  loginWithChallenge,
+  requestAccounts,
+} from '@yeying-community/web3-bs';
+
+const pending = await focusPendingApproval().catch(() => ({ focused: false }));
+if (!pending.focused) {
+  await requestAccounts();
+}
 
 await loginWithChallenge({
   baseUrl: 'http://localhost:3203/api/v1/public/auth',

package/dist/auth/provider.d.ts

@@ -1,4 +1,4 @@
-import { Eip1193Provider, ProviderDiscoveryOptions, ProviderInfo, RequestAccountsOptions, AccountSelection, PreferredAccountOptions, WatchAccountsOptions, AccountsChangedHandler, WatchProviderOptions, ProviderChangedHandler, WalletErrorInfo } from './types';
+import { Eip1193Provider, ProviderDiscoveryOptions, ProviderInfo, RequestAccountsOptions, AccountSelection, PreferredAccountOptions, 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;
@@ -9,6 +9,7 @@ export declare function isUserRejectedWalletAction(error: unknown): boolean;
 export declare function isWalletReconnectError(error: unknown): boolean;
 export declare function requireProvider(options?: ProviderDiscoveryOptions): Promise<Eip1193Provider>;
 export declare function requestAccounts(options?: RequestAccountsOptions): Promise<string[]>;
+export declare function focusPendingApproval(provider?: Eip1193Provider): Promise<FocusPendingApprovalResult>;
 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>;

package/dist/auth/types.d.ts

@@ -51,6 +51,13 @@ export interface RequestAccountsOptions {
     provider?: Eip1193Provider;
     dedupe?: boolean;
 }
+export type FocusPendingApprovalResult = {
+    focused: boolean;
+    type: string | null;
+    requestId?: string | null;
+    origin?: string;
+    tabId?: number | null;
+};
 export type AccountSelection = {
     account: string | null;
     accounts: string[];

package/dist/web3-bs.esm.js

@@ -294,6 +294,25 @@ async function requestAccounts(options = {}) {
         requestAccountsInFlight.delete(provider);
     }
 }
+async function focusPendingApproval(provider) {
+    const p = provider || (await requireProvider());
+    const result = await p.request({
+        method: 'wallet_focusPendingApproval',
+    });
+    if (!result || typeof result !== 'object') {
+        return { focused: false, type: null };
+    }
+    const payload = result;
+    return {
+        focused: Boolean(payload.focused),
+        type: typeof payload.type === 'string' ? payload.type : null,
+        requestId: typeof payload.requestId === 'string' ? payload.requestId : null,
+        origin: typeof payload.origin === 'string' ? payload.origin : '',
+        tabId: typeof payload.tabId === 'number' && Number.isFinite(payload.tabId)
+            ? payload.tabId
+            : null,
+    };
+}
 async function getAccounts(provider) {
     const p = provider || (await requireProvider());
     const accounts = (await p.request({ method: 'eth_accounts' }));
@@ -2166,5 +2185,5 @@ async function initDappSession(options) {
     return result;
 }
 
-export { WebDavClient, authCentralUcanFetch, authFetch, authUcanFetch, classifyWalletError, clearAccessToken, clearCentralSessionToken, clearUcanSession, createAndIssueCentralUcan, createCentralSession, createDelegationUcan, createInvocationUcan, createRootUcan, createUcanSession, createWebDavClient, deriveAppIdFromHost, deriveAppIdFromLocation, getAccessToken, getAccounts, getBalance, getCapabilityAction, getCapabilityResource, getCentralIssuerInfo, getCentralSessionToken, getChainId, getOrCreateUcanRoot, getPreferredAccount, getProvider, getStoredUcanRoot, getUcanSession, getWalletErrorCode, getWalletErrorMessage, initDappSession, initWebDavStorage, isUserRejectedWalletAction, isWalletReconnectError, isYeYingProvider, issueCentralUcan, loginWithChallenge, logout, normalizeAppHostnameForAppId, normalizeUcanCapabilities, normalizeUcanCapability, onAccountsChanged, onChainChanged, refreshAccessToken, requestAccounts, requireProvider, setAccessToken, setCentralSessionToken, signMessage, storeUcanRoot, watchAccounts, watchProvider };
+export { WebDavClient, authCentralUcanFetch, authFetch, authUcanFetch, classifyWalletError, clearAccessToken, clearCentralSessionToken, clearUcanSession, createAndIssueCentralUcan, createCentralSession, createDelegationUcan, createInvocationUcan, createRootUcan, createUcanSession, createWebDavClient, deriveAppIdFromHost, deriveAppIdFromLocation, focusPendingApproval, getAccessToken, getAccounts, getBalance, getCapabilityAction, getCapabilityResource, getCentralIssuerInfo, getCentralSessionToken, getChainId, getOrCreateUcanRoot, getPreferredAccount, getProvider, getStoredUcanRoot, getUcanSession, getWalletErrorCode, getWalletErrorMessage, initDappSession, initWebDavStorage, isUserRejectedWalletAction, isWalletReconnectError, isYeYingProvider, issueCentralUcan, loginWithChallenge, logout, normalizeAppHostnameForAppId, normalizeUcanCapabilities, normalizeUcanCapability, onAccountsChanged, onChainChanged, refreshAccessToken, requestAccounts, requireProvider, setAccessToken, setCentralSessionToken, signMessage, storeUcanRoot, watchAccounts, watchProvider };
 //# sourceMappingURL=web3-bs.esm.js.map