@onekeyfe/onekey-alph-provider 2.2.61 → 2.2.63

package/dist/OnekeyAlphProvider.d.ts

@@ -1,13 +1,12 @@
 import { IInpageProviderConfig } from '@onekeyfe/cross-inpage-provider-core';
 import { AlephiumWindowObject, EnableOptions, RequestMessage } from '@alephium/get-extension-wallet';
-import { NodeProvider, ExplorerProvider, InteractiveSignerProvider } from '@alephium/web3';
-import type { EnableOptionsBase, Account, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SignMessageParams, SignMessageResult } from '@alephium/web3';
+import { InteractiveSignerProvider } from '@alephium/web3';
+import type { EnableOptionsBase, Account, NodeProvider, ExplorerProvider, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SignMessageParams, SignMessageResult } from '@alephium/web3';
 import { ProviderAlphBase } from './ProviderAlphBase';
 type OneKeyTonProviderProps = IInpageProviderConfig & {
     timeout?: number;
 };
 export declare class ProviderAlph extends InteractiveSignerProvider implements AlephiumWindowObject {
-    #private;
     _base: ProviderAlphBase;
     id: string;
     name: string;
@@ -15,6 +14,8 @@ export declare class ProviderAlph extends InteractiveSignerProvider implements A
     version: string;
     _accountInfo: Account | undefined;
     onDisconnected: (() => void | Promise<void>) | undefined;
+    _nodeProvider: NodeProvider | undefined;
+    _explorerProvider: ExplorerProvider | undefined;
     constructor(props: OneKeyTonProviderProps);
     private bridgeRequest;
     on(eventName: string | symbol, listener: (...args: unknown[]) => void): void;
@@ -33,6 +34,17 @@ export declare class ProviderAlph extends InteractiveSignerProvider implements A
     unsafeEnable(opt?: EnableOptionsBase | undefined): Promise<Account>;
     get nodeProvider(): NodeProvider | undefined;
     get explorerProvider(): ExplorerProvider | undefined;
+    /**
+     * Create a two-level Proxy that forwards all property access to the App side
+     * via bridge, where the real NodeProvider/ExplorerProvider executes the call.
+     *
+     * Handles three usage patterns:
+     * 1. provider.namespace.method(...args)  -- e.g. nodeProvider.addresses.getAddressesAddressBalance('T...')
+     * 2. provider.directMethod(...args)      -- e.g. nodeProvider.fetchFungibleTokenMetaData(tokenId)
+     * 3. provider.request(args)              -- low-level API
+     */
+    private _sanitizeBridgeParams;
+    private _createProviderProxy;
     unsafeGetSelectedAccount(): Promise<Account>;
     signAndSubmitDeployContractTx(params: SignDeployContractTxParams): Promise<SignDeployContractTxResult>;
     signAndSubmitExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignExecuteScriptTxResult>;

package/dist/OnekeyAlphProvider.js

@@ -7,20 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _ProviderAlph_nodeProvider, _ProviderAlph_explorerProvider;
 import { getOrCreateExtInjectedJsBridge } from '@onekeyfe/extension-bridge-injected';
-import { NodeProvider, ExplorerProvider, InteractiveSignerProvider } from '@alephium/web3';
+import { InteractiveSignerProvider } from '@alephium/web3';
 import { ProviderAlphBase } from './ProviderAlphBase';
 const PROVIDER_EVENTS = {
     'disconnect': 'disconnect',
@@ -40,10 +28,19 @@ export class ProviderAlph extends InteractiveSignerProvider {
         this.icon = 'https://uni.onekey-asset.com/static/logo/onekey.png';
         this.version = '0.9.4';
         this.onDisconnected = undefined;
-        _ProviderAlph_nodeProvider.set(this, undefined);
-        _ProviderAlph_explorerProvider.set(this, undefined);
+        // NOTE: Do NOT use `private` keyword here — TypeScript compiles it to WeakMap-based
+        // access, which breaks when the instance is wrapped in a Proxy by defineWindowProperty().
+        this._nodeProvider = undefined;
+        this._explorerProvider = undefined;
         this._base = new ProviderAlphBase(Object.assign(Object.assign({}, props), { bridge: props.bridge || getOrCreateExtInjectedJsBridge({ timeout: props.timeout }) }));
         this.version = this._base.version;
+        // Create proxy providers eagerly in the constructor.
+        // defineWindowProperty() wraps the instance in a Proxy whose defineProperty
+        // trap silently blocks property assignments not in its whitelist.
+        // Lazy assignment in the getter (this._nodeProvider = ...) is swallowed
+        // by that trap, so we must set these before the Proxy wrapping happens.
+        this._nodeProvider = this._createProviderProxy('alph_nodeProvider_request');
+        this._explorerProvider = this._createProviderProxy('alph_explorerProvider_request');
         this._registerEvents();
     }
     bridgeRequest(data) {
@@ -161,16 +158,59 @@ export class ProviderAlph extends InteractiveSignerProvider {
         return this.bridgeRequest({ method: 'unsafeEnable', params });
     }
     get nodeProvider() {
-        if (!__classPrivateFieldGet(this, _ProviderAlph_nodeProvider, "f")) {
-            __classPrivateFieldSet(this, _ProviderAlph_nodeProvider, new NodeProvider('https://node.mainnet.alephium.org'), "f");
-        }
-        return __classPrivateFieldGet(this, _ProviderAlph_nodeProvider, "f");
+        return this._nodeProvider;
     }
     get explorerProvider() {
-        if (!__classPrivateFieldGet(this, _ProviderAlph_explorerProvider, "f")) {
-            __classPrivateFieldSet(this, _ProviderAlph_explorerProvider, new ExplorerProvider('https://backend.mainnet.alephium.org'), "f");
+        return this._explorerProvider;
+    }
+    /**
+     * Create a two-level Proxy that forwards all property access to the App side
+     * via bridge, where the real NodeProvider/ExplorerProvider executes the call.
+     *
+     * Handles three usage patterns:
+     * 1. provider.namespace.method(...args)  -- e.g. nodeProvider.addresses.getAddressesAddressBalance('T...')
+     * 2. provider.directMethod(...args)      -- e.g. nodeProvider.fetchFungibleTokenMetaData(tokenId)
+     * 3. provider.request(args)              -- low-level API
+     */
+    // eslint-disable-next-line class-methods-use-this
+    _sanitizeBridgeParams(value) {
+        if (typeof value === 'bigint')
+            return value.toString();
+        if (Array.isArray(value))
+            return value.map((v) => this._sanitizeBridgeParams(v));
+        if (value !== null && typeof value === 'object') {
+            const out = {};
+            for (const [k, v] of Object.entries(value)) {
+                out[k] = this._sanitizeBridgeParams(v);
+            }
+            return out;
         }
-        return __classPrivateFieldGet(this, _ProviderAlph_explorerProvider, "f");
+        return value;
+    }
+    _createProviderProxy(bridgeMethod) {
+        const bridge = this.bridgeRequest.bind(this);
+        const sanitize = this._sanitizeBridgeParams.bind(this);
+        const forward = (args) => bridge({ method: bridgeMethod, params: sanitize(args) });
+        return new Proxy(Object.create(null), {
+            get(_, prop) {
+                if (typeof prop !== 'string' || prop === 'then' || prop === 'toJSON')
+                    return undefined;
+                // request() — standard low-level API: provider.request({ path, method, params })
+                if (prop === 'request')
+                    return forward;
+                // Return a callable Proxy:
+                // - Called directly → direct method:  provider.fetchFungibleTokenMetaData(tokenId)
+                // - Property access → namespace.method: provider.addresses.getBalance(addr)
+                const directCall = (...args) => forward({ path: prop, params: args });
+                return new Proxy(directCall, {
+                    get(_, method) {
+                        if (typeof method !== 'string' || method === 'then')
+                            return undefined;
+                        return (...args) => forward({ path: prop, method, params: args });
+                    },
+                });
+            },
+        });
     }
     unsafeGetSelectedAccount() {
         return this.bridgeRequest({ method: 'unsafeGetSelectedAccount' });
@@ -218,4 +258,3 @@ export class ProviderAlph extends InteractiveSignerProvider {
         });
     }
 }
-_ProviderAlph_nodeProvider = new WeakMap(), _ProviderAlph_explorerProvider = new WeakMap();

package/dist/cjs/OnekeyAlphProvider.js

@@ -8,18 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _ProviderAlph_nodeProvider, _ProviderAlph_explorerProvider;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProviderAlph = void 0;
 const extension_bridge_injected_1 = require("@onekeyfe/extension-bridge-injected");
@@ -43,10 +31,19 @@ class ProviderAlph extends web3_1.InteractiveSignerProvider {
         this.icon = 'https://uni.onekey-asset.com/static/logo/onekey.png';
         this.version = '0.9.4';
         this.onDisconnected = undefined;
-        _ProviderAlph_nodeProvider.set(this, undefined);
-        _ProviderAlph_explorerProvider.set(this, undefined);
+        // NOTE: Do NOT use `private` keyword here — TypeScript compiles it to WeakMap-based
+        // access, which breaks when the instance is wrapped in a Proxy by defineWindowProperty().
+        this._nodeProvider = undefined;
+        this._explorerProvider = undefined;
         this._base = new ProviderAlphBase_1.ProviderAlphBase(Object.assign(Object.assign({}, props), { bridge: props.bridge || (0, extension_bridge_injected_1.getOrCreateExtInjectedJsBridge)({ timeout: props.timeout }) }));
         this.version = this._base.version;
+        // Create proxy providers eagerly in the constructor.
+        // defineWindowProperty() wraps the instance in a Proxy whose defineProperty
+        // trap silently blocks property assignments not in its whitelist.
+        // Lazy assignment in the getter (this._nodeProvider = ...) is swallowed
+        // by that trap, so we must set these before the Proxy wrapping happens.
+        this._nodeProvider = this._createProviderProxy('alph_nodeProvider_request');
+        this._explorerProvider = this._createProviderProxy('alph_explorerProvider_request');
         this._registerEvents();
     }
     bridgeRequest(data) {
@@ -164,16 +161,59 @@ class ProviderAlph extends web3_1.InteractiveSignerProvider {
         return this.bridgeRequest({ method: 'unsafeEnable', params });
     }
     get nodeProvider() {
-        if (!__classPrivateFieldGet(this, _ProviderAlph_nodeProvider, "f")) {
-            __classPrivateFieldSet(this, _ProviderAlph_nodeProvider, new web3_1.NodeProvider('https://node.mainnet.alephium.org'), "f");
-        }
-        return __classPrivateFieldGet(this, _ProviderAlph_nodeProvider, "f");
+        return this._nodeProvider;
     }
     get explorerProvider() {
-        if (!__classPrivateFieldGet(this, _ProviderAlph_explorerProvider, "f")) {
-            __classPrivateFieldSet(this, _ProviderAlph_explorerProvider, new web3_1.ExplorerProvider('https://backend.mainnet.alephium.org'), "f");
+        return this._explorerProvider;
+    }
+    /**
+     * Create a two-level Proxy that forwards all property access to the App side
+     * via bridge, where the real NodeProvider/ExplorerProvider executes the call.
+     *
+     * Handles three usage patterns:
+     * 1. provider.namespace.method(...args)  -- e.g. nodeProvider.addresses.getAddressesAddressBalance('T...')
+     * 2. provider.directMethod(...args)      -- e.g. nodeProvider.fetchFungibleTokenMetaData(tokenId)
+     * 3. provider.request(args)              -- low-level API
+     */
+    // eslint-disable-next-line class-methods-use-this
+    _sanitizeBridgeParams(value) {
+        if (typeof value === 'bigint')
+            return value.toString();
+        if (Array.isArray(value))
+            return value.map((v) => this._sanitizeBridgeParams(v));
+        if (value !== null && typeof value === 'object') {
+            const out = {};
+            for (const [k, v] of Object.entries(value)) {
+                out[k] = this._sanitizeBridgeParams(v);
+            }
+            return out;
         }
-        return __classPrivateFieldGet(this, _ProviderAlph_explorerProvider, "f");
+        return value;
+    }
+    _createProviderProxy(bridgeMethod) {
+        const bridge = this.bridgeRequest.bind(this);
+        const sanitize = this._sanitizeBridgeParams.bind(this);
+        const forward = (args) => bridge({ method: bridgeMethod, params: sanitize(args) });
+        return new Proxy(Object.create(null), {
+            get(_, prop) {
+                if (typeof prop !== 'string' || prop === 'then' || prop === 'toJSON')
+                    return undefined;
+                // request() — standard low-level API: provider.request({ path, method, params })
+                if (prop === 'request')
+                    return forward;
+                // Return a callable Proxy:
+                // - Called directly → direct method:  provider.fetchFungibleTokenMetaData(tokenId)
+                // - Property access → namespace.method: provider.addresses.getBalance(addr)
+                const directCall = (...args) => forward({ path: prop, params: args });
+                return new Proxy(directCall, {
+                    get(_, method) {
+                        if (typeof method !== 'string' || method === 'then')
+                            return undefined;
+                        return (...args) => forward({ path: prop, method, params: args });
+                    },
+                });
+            },
+        });
     }
     unsafeGetSelectedAccount() {
         return this.bridgeRequest({ method: 'unsafeGetSelectedAccount' });
@@ -222,4 +262,3 @@ class ProviderAlph extends web3_1.InteractiveSignerProvider {
     }
 }
 exports.ProviderAlph = ProviderAlph;
-_ProviderAlph_nodeProvider = new WeakMap(), _ProviderAlph_explorerProvider = new WeakMap();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-alph-provider",
-  "version": "2.2.61",
+  "version": "2.2.63",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -31,15 +31,15 @@
     "@alephium/get-extension-wallet": "^1.5.2",
     "@alephium/walletconnect-provider": "^1.5.2",
     "@alephium/web3": "^1.5.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.2.61",
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.61",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.61",
-    "@onekeyfe/extension-bridge-injected": "2.2.61",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.63",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.63",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.63",
+    "@onekeyfe/extension-bridge-injected": "2.2.63",
     "cipher-base": "^1.0.6",
     "elliptic": "^6.6.1",
     "patch-package": "^8.0.0",
     "pbkdf2": "^3.1.3",
     "sha.js": "^2.4.12"
   },
-  "gitHead": "1e98fecc19bda6cea42ecd616f3e432749f6dd0d"
+  "gitHead": "321fff7491b90508f1adb921307e01539a867152"
 }