@yeying-community/web3-bs 1.0.12 → 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/encrypt.d.ts

@@ -0,0 +1,54 @@
+/**
+ * 加密/解密 SDK API
+ *
+ * 调用钱包插件的 `yeying_encrypt` / `yeying_decrypt` / `yeying_getCipherSuites`
+ * EIP-1193 自定义方法。命名安全套件 + 静默执行 + 站点授权模型同 UCAN。
+ *
+ * 数据密码（password 参数）由 DApp 自行管理与钱包密码独立；
+ * plaintext 走 base64 字符串跨 message 边界传输。
+ */
+import { isUserRejectedWalletAction } from './provider';
+import type { Eip1193Provider } from './types';
+export interface CipherSuiteInfo {
+    name: string;
+    description: string;
+    mode: 'hash' | 'symmetric';
+}
+export interface EncryptOptions {
+    data: string | Uint8Array;
+    password: string;
+    suite?: string;
+    provider?: Eip1193Provider;
+}
+export interface DecryptOptions {
+    ciphertext: string;
+    password: string;
+    provider?: Eip1193Provider;
+}
+export interface GetCipherSuitesOptions {
+    provider?: Eip1193Provider;
+}
+export declare class CipherError extends Error {
+    readonly type: 'userRejected' | 'disconnected' | 'timeout' | 'notFound' | 'unknown';
+    readonly code: number | null;
+    readonly originalError: unknown;
+    constructor(message: string, type: CipherError['type'], code: number | null, originalError: unknown);
+}
+declare function bytesToBase64(bytes: Uint8Array): string;
+declare function base64ToBytes(b64: string): Uint8Array;
+/**
+ * 用指定/默认套件加密数据
+ * @returns v1 格式密文 base64 字符串
+ */
+export declare function encrypt(options: EncryptOptions): Promise<string>;
+/**
+ * 解密 v1 格式密文
+ * @returns 明文 Uint8Array
+ */
+export declare function decrypt(options: DecryptOptions): Promise<Uint8Array>;
+/**
+ * 列出可用的命名安全套件
+ */
+export declare function getSupportedCipherSuites(options?: GetCipherSuitesOptions): Promise<CipherSuiteInfo[]>;
+export { bytesToBase64, base64ToBytes };
+export { isUserRejectedWalletAction };

package/dist/auth/index.d.ts

@@ -3,3 +3,4 @@ export * from './provider';
 export * from './siwe';
 export * from './ucan';
 export * from './central';
+export * from './encrypt';

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;
@@ -1810,6 +1864,122 @@ async function authCentralUcanFetch(input, init = {}, options = {}) {
     });
 }
 
+/**
+ * 加密/解密 SDK API
+ *
+ * 调用钱包插件的 `yeying_encrypt` / `yeying_decrypt` / `yeying_getCipherSuites`
+ * EIP-1193 自定义方法。命名安全套件 + 静默执行 + 站点授权模型同 UCAN。
+ *
+ * 数据密码（password 参数）由 DApp 自行管理与钱包密码独立；
+ * plaintext 走 base64 字符串跨 message 边界传输。
+ */
+class CipherError extends Error {
+    type;
+    code;
+    originalError;
+    constructor(message, type, code, originalError) {
+        super(message);
+        this.name = 'CipherError';
+        this.type = type;
+        this.code = code;
+        this.originalError = originalError;
+    }
+}
+function wrapCipherError(err) {
+    const info = classifyWalletError(err);
+    throw new CipherError(info.message, info.type, info.code, err);
+}
+function bytesToBase64(bytes) {
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(bytes).toString('base64');
+    }
+    let binary = '';
+    for (let i = 0; i < bytes.length; i += 1) {
+        binary += String.fromCharCode(bytes[i]);
+    }
+    return btoa(binary);
+}
+function base64ToBytes(b64) {
+    if (typeof Buffer !== 'undefined') {
+        return new Uint8Array(Buffer.from(b64, 'base64'));
+    }
+    const binary = atob(b64);
+    const out = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i += 1)
+        out[i] = binary.charCodeAt(i);
+    return out;
+}
+/**
+ * 用指定/默认套件加密数据
+ * @returns v1 格式密文 base64 字符串
+ */
+async function encrypt(options) {
+    const provider = options.provider || (await requireProvider());
+    try {
+        const result = await provider.request({
+            method: 'yeying_encrypt',
+            params: [{
+                    data: options.data,
+                    password: options.password,
+                    suite: options.suite
+                }]
+        });
+        if (!result || typeof result !== 'object' || typeof result.ciphertext !== 'string') {
+            throw new Error('Invalid encrypt response: missing ciphertext');
+        }
+        return result.ciphertext;
+    }
+    catch (err) {
+        wrapCipherError(err);
+    }
+}
+/**
+ * 解密 v1 格式密文
+ * @returns 明文 Uint8Array
+ */
+async function decrypt(options) {
+    const provider = options.provider || (await requireProvider());
+    try {
+        const result = await provider.request({
+            method: 'yeying_decrypt',
+            params: [{
+                    ciphertext: options.ciphertext,
+                    password: options.password
+                }]
+        });
+        if (!result || typeof result !== 'object' || typeof result.plaintext !== 'string') {
+            throw new Error('Invalid decrypt response: missing plaintext');
+        }
+        const { plaintext, encoding } = result;
+        if (encoding && encoding !== 'base64') {
+            throw new Error(`Unsupported plaintext encoding: ${encoding}`);
+        }
+        return base64ToBytes(plaintext);
+    }
+    catch (err) {
+        wrapCipherError(err);
+    }
+}
+/**
+ * 列出可用的命名安全套件
+ */
+async function getSupportedCipherSuites(options = {}) {
+    const provider = options.provider || (await requireProvider());
+    try {
+        const result = await provider.request({
+            method: 'yeying_getCipherSuites',
+            params: []
+        });
+        if (!result || typeof result !== 'object' || !Array.isArray(result.suites)) {
+            throw new Error('Invalid getCipherSuites response: missing suites array');
+        }
+        return result.suites;
+    }
+    catch (err) {
+        wrapCipherError(err);
+    }
+}
+
 function normalizeBaseUrl(baseUrl) {
     return baseUrl.replace(/\/+$/, '');
 }
@@ -2355,5 +2525,5 @@ async function initDappSession(options) {
     return result;
 }
 
-export { DEFAULT_UCAN_SESSION_TTL_MS, DEFAULT_UCAN_TOKEN_SKEW_MS, DEFAULT_UCAN_TOKEN_TTL_MS, WebDavClient, authCentralUcanFetch, authFetch, authUcanFetch, classifyUcanAuthError, classifyWalletError, clearAccessToken, clearCentralSessionToken, clearUcanSession, createAndIssueCentralUcan, createCentralSession, createDelegationUcan, createInvocationUcan, createRootUcan, createUcanSession, createWebDavClient, decodeUcanPayload, deriveAppIdFromHost, deriveAppIdFromLocation, focusPendingApproval, getAccessToken, getAccounts, getBalance, getCapabilityAction, getCapabilityResource, getCentralIssuerInfo, getCentralSessionToken, getChainId, getOrCreateInvocationUcan, getOrCreateUcanRoot, getPreferredAccount, getProvider, getStoredUcanRoot, 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