@onekeyfe/inpage-providers-hub 2.0.0 → 2.0.2

package/dist/connectButtonHack/universal/findIconAndName.d.ts

@@ -5,11 +5,11 @@ import { ConstraintFn, FindResultType, Selector } from './type';
  *   don't document to querySelector because it maybe not work in shadowRoot,
  *   instead of it, use the containerElement
  */
-export declare function findIconAndNameByParent(containerElement: HTMLElement, walletName: RegExp, constraints?: {
+export declare function findIconAndNameByName(containerElement: HTMLElement, walletName: RegExp, icon?: 'auto-search-icon' | ((text: Text) => HTMLElement | null | undefined), constraints?: {
     text: ConstraintFn[];
     icon: ConstraintFn[];
 }): FindResultType | null;
-export declare function findIconAndNameDirectly(iconSelector: Selector | (() => HTMLElement | null | undefined), textSelector: 'auto-search-text' | ((icon: HTMLElement) => HTMLElement | null | undefined) | (Selector & Record<never, never>), name: RegExp, container?: HTMLElement | Document, constraints?: {
+export declare function findIconAndNameByIcon(iconSelector: Selector | (() => HTMLElement | null | undefined), textSelector: 'auto-search-text' | ((icon: HTMLElement) => HTMLElement | null | undefined), name: RegExp, container?: HTMLElement | Document, constraints?: {
     text: ConstraintFn[];
     icon: ConstraintFn[];
 }, searchLevel?: number): FindResultType | null;

package/dist/connectButtonHack/universal/findIconAndName.js

@@ -1,5 +1,5 @@
 import { MAX_LEVELS, MAX_SEARCH_LEVELS_By_IMG } from './consts';
-import { findWalletIconByParent, isWalletIconSizeMatch } from './imgUtils';
+import { findWalletIconByParent, isWalletIconLessEqualThan } from './imgUtils';
 import { findWalletTextByParent } from './textUtils';
 import { arrayify, isClickable, isInExternalLink, universalLog } from './utils';
 /**
@@ -8,9 +8,9 @@ import { arrayify, isClickable, isInExternalLink, universalLog } from './utils';
  *   don't document to querySelector because it maybe not work in shadowRoot,
  *   instead of it, use the containerElement
  */
-export function findIconAndNameByParent(containerElement, walletName, constraints = {
+export function findIconAndNameByName(containerElement, walletName, icon = 'auto-search-icon', constraints = {
     text: [isClickable],
-    icon: [isWalletIconSizeMatch, isClickable],
+    icon: [isWalletIconLessEqualThan, isClickable],
 }) {
     const textNode = findWalletTextByParent(containerElement, walletName, constraints.text);
     if (!textNode || !textNode.parentElement) {
@@ -21,18 +21,26 @@ export function findIconAndNameByParent(containerElement, walletName, constraint
         universalLog.log(`${walletName.toString()} is in external link`);
         return null;
     }
-    let parent = textNode.parentElement;
     let iconNode = undefined;
-    let level = 0;
-    while (parent && parent !== (containerElement === null || containerElement === void 0 ? void 0 : containerElement.parentElement) && level++ < MAX_LEVELS) {
-        const walletIcon = findWalletIconByParent(parent, constraints.icon);
-        //TODO: unnecessary to traverse the parent node if the icon have more than one
-        if (!walletIcon) {
-            parent = parent.parentElement;
-            continue;
+    if (typeof icon === 'function') {
+        iconNode = icon(textNode);
+    }
+    else if (icon === 'auto-search-icon') {
+        let parent = textNode.parentElement;
+        let level = 0;
+        while (parent && parent !== (containerElement === null || containerElement === void 0 ? void 0 : containerElement.parentElement) && level++ < MAX_LEVELS) {
+            const walletIcon = findWalletIconByParent(parent, constraints.icon);
+            if (!walletIcon) {
+                parent = parent.parentElement;
+                continue;
+            }
+            iconNode = walletIcon;
+            break;
         }
-        iconNode = walletIcon;
-        break;
+    }
+    else {
+        universalLog.warn('icon paramter should be a function or auto-search-icon');
+        return null;
     }
     if (!iconNode) {
         universalLog.log(`no wallet ${walletName.toString()} icon node found`);
@@ -41,8 +49,7 @@ export function findIconAndNameByParent(containerElement, walletName, constraint
     // make sure the icon and text are both existed
     return { iconNode, textNode };
 }
-export function findIconAndNameDirectly(iconSelector, textSelector, name, container = document, constraints = { text: [], icon: [] }, searchLevel = MAX_SEARCH_LEVELS_By_IMG) {
-    var _a;
+export function findIconAndNameByIcon(iconSelector, textSelector, name, container = document, constraints = { text: [], icon: [] }, searchLevel = MAX_SEARCH_LEVELS_By_IMG) {
     const iconElements = typeof iconSelector === 'string'
         ? container.querySelectorAll(iconSelector)
         : arrayify(iconSelector());
@@ -51,6 +58,7 @@ export function findIconAndNameDirectly(iconSelector, textSelector, name, contai
         return null;
     }
     const iconElement = Array.from(iconElements)[0];
+    //find the text node by img
     let textNode = null;
     if (textSelector === 'auto-search-text') {
         const containerEle = container instanceof HTMLElement ? container : document.body;
@@ -58,14 +66,6 @@ export function findIconAndNameDirectly(iconSelector, textSelector, name, contai
             ? findTextByImg(iconElement, name, containerEle, constraints.text, searchLevel)
             : null;
     }
-    else if (typeof textSelector === 'string') {
-        const textContainer = (_a = Array.from(container.querySelectorAll(textSelector))) === null || _a === void 0 ? void 0 : _a.filter(Boolean);
-        if ((textContainer === null || textContainer === void 0 ? void 0 : textContainer.length) > 1) {
-            universalLog.warn('more one wallet text found ,please check the selector');
-            return null;
-        }
-        textNode = findWalletTextByParent(textContainer[0], name, constraints.text);
-    }
     else if (typeof textSelector === 'function') {
         const containerEle = iconElement && textSelector(iconElement);
         textNode =
@@ -90,7 +90,7 @@ export function findTextByImg(img, walletName, containerLimit, constraints, maxL
     let text = null;
     let parent = img;
     let level = 0;
-    while (parent && parent != containerLimit && level++ < maxLevel) {
+    while (parent && parent != containerLimit.parentElement && level++ < maxLevel) {
         text = findWalletTextByParent(parent, walletName, constraints);
         if (text) {
             return text;

package/dist/connectButtonHack/universal/imgUtils.d.ts

@@ -10,4 +10,5 @@ export declare function findIconNodesByParent(parent: HTMLElement): HTMLElement[
  * make sure that there is only one icon node match walletIcon to ignore hidden icon and other icon
  */
 export declare function findWalletIconByParent(parent: HTMLElement, constraints: ConstraintFn[]): HTMLElement | null;
-export declare function isWalletIconSizeMatch(walletIcon: HTMLElement): boolean;
+export declare function isWalletIconSizeMatch(walletIcon: HTMLElement, min?: number, max?: number): boolean;
+export declare function isWalletIconLessEqualThan(walletIcon: HTMLElement): boolean;

package/dist/connectButtonHack/universal/imgUtils.js

@@ -11,9 +11,6 @@ export function replaceIcon(originalNode, newIconSrc) {
     if (originalNode instanceof HTMLImageElement) {
         originalNode.src = newIconSrc;
         originalNode.removeAttribute('srcset');
-        originalNode.style.width = width;
-        originalNode.style.height = height;
-        originalNode.classList.add(...Array.from(originalNode.classList));
         return originalNode;
     }
     else {
@@ -54,27 +51,26 @@ export function findIconNodesByParent(parent) {
 export function findWalletIconByParent(parent, constraints) {
     const iconNodes = findIconNodesByParent(parent);
     if (iconNodes.length === 0) {
-        universalLog.warn(`no icon node found`, parent);
+        universalLog.warn(`no icon node found for parent`, parent);
         return null;
     }
     if (iconNodes.length > 1) {
         universalLog.warn(`more than one icon node found`, iconNodes.length, iconNodes);
-        return null;
+        throw new Error('more than one icon node found');
     }
     const icon = iconNodes[0];
     if (constraints.some((f) => !f(icon))) {
-        universalLog.warn('it doesnt satisfy the constraints');
-        return null;
+        throw new Error('it doesnt satisfy the constraints');
     }
     return icon;
 }
-//TODO:  deal with lazy loading image
-export function isWalletIconSizeMatch(walletIcon) {
+//NOTE:  use function isWalletIconLessEqualThan with lazy loading image
+export function isWalletIconSizeMatch(walletIcon, min = ICON_MIN_SIZE, max = ICON_MAX_SIZE) {
     const { width, height } = walletIcon.getBoundingClientRect();
-    const isMatch = width < ICON_MAX_SIZE &&
-        width > ICON_MIN_SIZE &&
-        height < ICON_MAX_SIZE &&
-        height > ICON_MIN_SIZE;
+    const isMatch = width <= max && width >= min && height <= max && height >= min;
     !isMatch && universalLog.log('wallet icon size doesnot match: ', width, height);
     return isMatch;
 }
+export function isWalletIconLessEqualThan(walletIcon) {
+    return isWalletIconSizeMatch(walletIcon, 0, ICON_MAX_SIZE);
+}

package/dist/connectButtonHack/universal/index.js

@@ -1,6 +1,6 @@
 import { hackConnectButton } from '../hackConnectButton';
 import { sitesConfig } from './config';
-import { findIconAndNameByParent as defaultFindIconAndName } from './findIconAndName';
+import { findIconAndNameByName as defaultFindIconAndName } from './findIconAndName';
 import { replaceIcon as defaultReplaceIcon } from './imgUtils';
 import { replaceText as defaultReplaceText } from './textUtils';
 import { createWalletId, universalLog } from './utils';
@@ -47,7 +47,7 @@ function hackWalletConnectButton(sites) {
                                         universalLog.warn('containerElement is null, container=', container);
                                         continue;
                                     }
-                                    result = defaultFindIconAndName(containerElement, name, constraintMap);
+                                    result = defaultFindIconAndName(containerElement, name, 'auto-search-icon', constraintMap);
                                 }
                                 if (!result) {
                                     universalLog.warn('no result found');

package/dist/connectButtonHack/universal/shadowRoot.js

@@ -1,9 +1,9 @@
-import { findIconAndNameByParent } from './findIconAndName';
+import { findIconAndNameByName } from './findIconAndName';
 import { isClickable, universalLog } from './utils';
-import { isWalletIconSizeMatch } from './imgUtils';
+import { isWalletIconLessEqualThan } from './imgUtils';
 export function findIconAndNameInShadowRoot(hostSelector, containerSelector, walletName, constraints = {
     text: [isClickable],
-    icon: [isWalletIconSizeMatch, isClickable],
+    icon: [isWalletIconLessEqualThan, isClickable],
 }) {
     const shadowRoots = Array.from(document.querySelectorAll(hostSelector))
         .filter(Boolean)
@@ -21,5 +21,5 @@ export function findIconAndNameInShadowRoot(hostSelector, containerSelector, wal
         universalLog.warn('findIconAndNameInShadowRoot,length=', length);
         return null;
     }
-    return findIconAndNameByParent(containerElements[0], walletName, constraints);
+    return findIconAndNameByName(containerElements[0], walletName, 'auto-search-icon', constraints);
 }

package/dist/connectButtonHack/universal/textUtils.d.ts

@@ -1,6 +1,9 @@
 import { ConstraintFn } from './type';
 export declare function makeTextEllipse(textNode: HTMLElement, option?: Partial<CSSStyleDeclaration>): void;
 export declare function makeTextWrap(textNode: HTMLElement): void;
+export declare function makeTextWordBreak(textNode: HTMLElement): void;
+export declare function makeTextAlignLeft(textNode: HTMLElement): void;
+export declare function makeTextAlignCenter(textNode: HTMLElement): void;
 export declare function replaceText(textNode: Text, newText: string): Text;
 /**
  * @description:

package/dist/connectButtonHack/universal/textUtils.js

@@ -9,6 +9,15 @@ export function makeTextEllipse(textNode, option = {}) {
 export function makeTextWrap(textNode) {
     textNode.style.whiteSpace = 'normal';
 }
+export function makeTextWordBreak(textNode) {
+    textNode.style.wordBreak = 'break-word';
+}
+export function makeTextAlignLeft(textNode) {
+    textNode.style.textAlign = 'left';
+}
+export function makeTextAlignCenter(textNode) {
+    textNode.style.textAlign = 'center';
+}
 export function replaceText(textNode, newText) {
     const newTextNode = document.createTextNode(newText);
     textNode.replaceWith(newTextNode);

package/dist/injectWeb3Provider.d.ts

@@ -17,7 +17,6 @@ export type IWindowOneKeyHub = {
     phantom?: {
         solana?: ProviderSolana;
     };
-    starcoin?: any;
     aptos?: ProviderAptos;
     petra?: ProviderAptos;
     martian?: ProviderAptosMartian;

package/dist/injectWeb3Provider.js

@@ -1,12 +1,12 @@
 import { ProviderEthereum, shimWeb3, registerEIP6963Provider } from '@onekeyfe/onekey-eth-provider';
 import { ProviderPrivate } from '@onekeyfe/onekey-private-provider';
 import { ProviderSolana, registerSolanaWallet } from '@onekeyfe/onekey-solana-provider';
-import { ProviderStarcoin } from '@onekeyfe/onekey-starcoin-provider';
+// import { ProviderStarcoin } from '@onekeyfe/onekey-starcoin-provider';
 import { ProviderAptosMartian } from '@onekeyfe/onekey-aptos-provider';
 import { ProviderConflux } from '@onekeyfe/onekey-conflux-provider';
 import { ProviderTron } from '@onekeyfe/onekey-tron-provider';
 import { ProviderCardano, defineWindowCardanoProperty } from '@onekeyfe/onekey-cardano-provider';
-import { ProviderPrivateExternalAccount } from '@onekeyfe/onekey-private-external-account-provider';
+// import { ProviderPrivateExternalAccount } from '@onekeyfe/onekey-private-external-account-provider';
 import { ProviderCosmos } from '@onekeyfe/onekey-cosmos-provider';
 import { ProviderPolkadot, registerPolkadot } from '@onekeyfe/onekey-polkadot-provider';
 import { defineWindowProperty, checkWalletSwitchEnable, } from '@onekeyfe/cross-inpage-provider-core';
@@ -33,9 +33,9 @@ function injectWeb3Provider() {
     const solana = new ProviderSolana({
         bridge,
     });
-    const starcoin = new ProviderStarcoin({
-        bridge,
-    });
+    // const starcoin = new ProviderStarcoin({
+    //   bridge,
+    // });
     const martian = new ProviderAptosMartian({
         bridge,
     });
@@ -66,13 +66,14 @@ function injectWeb3Provider() {
     const btc = new ProviderBtc({ bridge });
     const btcWallet = new ProviderBtcWallet({ bridge });
     const algorand = new ProviderAlgo({ bridge });
-    const $privateExternalAccount = new ProviderPrivateExternalAccount({ bridge });
+    // const $privateExternalAccount = new ProviderPrivateExternalAccount({ bridge });
     // providerHub
     const $onekey = Object.assign(Object.assign({}, window.$onekey), { jsBridge: bridge, $private,
-        $privateExternalAccount,
+        // $privateExternalAccount,
         ethereum,
-        solana,
-        starcoin, aptos: martian, conflux,
+        solana, 
+        // starcoin,
+        aptos: martian, conflux,
         tron, sollet: null, sui,
         cardano,
         cosmos,
@@ -105,7 +106,7 @@ function injectWeb3Provider() {
     }
     defineWindowProperty('solana', solana);
     defineWindowProperty('phantom', { solana });
-    defineWindowProperty('starcoin', starcoin);
+    // defineWindowProperty('starcoin', starcoin);
     defineWindowProperty('aptos', martian);
     defineWindowProperty('petra', martian, { enumerable: true });
     defineWindowProperty('martian', martianProxy, { enumerable: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/inpage-providers-hub",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -26,27 +26,27 @@
     "prebuild": "rm -rf dist",
     "build": "tsc && tsc --project tsconfig.cjs.json",
     "test": "npx playwright test",
+    "test:report": "npx playwright show-report reports",
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.0.0",
-    "@onekeyfe/cross-inpage-provider-types": "2.0.0",
-    "@onekeyfe/onekey-algo-provider": "2.0.0",
-    "@onekeyfe/onekey-aptos-provider": "2.0.0",
-    "@onekeyfe/onekey-btc-provider": "2.0.0",
-    "@onekeyfe/onekey-cardano-provider": "2.0.0",
-    "@onekeyfe/onekey-conflux-provider": "2.0.0",
-    "@onekeyfe/onekey-cosmos-provider": "2.0.0",
-    "@onekeyfe/onekey-eth-provider": "2.0.0",
-    "@onekeyfe/onekey-nostr-provider": "2.0.0",
-    "@onekeyfe/onekey-polkadot-provider": "2.0.0",
-    "@onekeyfe/onekey-private-external-account-provider": "2.0.0",
-    "@onekeyfe/onekey-private-provider": "2.0.0",
-    "@onekeyfe/onekey-solana-provider": "2.0.0",
-    "@onekeyfe/onekey-starcoin-provider": "2.0.0",
-    "@onekeyfe/onekey-sui-provider": "2.0.0",
-    "@onekeyfe/onekey-tron-provider": "2.0.0",
-    "@onekeyfe/onekey-webln-provider": "2.0.0",
+    "@onekeyfe/cross-inpage-provider-core": "2.0.2",
+    "@onekeyfe/cross-inpage-provider-types": "2.0.2",
+    "@onekeyfe/onekey-algo-provider": "2.0.2",
+    "@onekeyfe/onekey-aptos-provider": "2.0.2",
+    "@onekeyfe/onekey-btc-provider": "2.0.2",
+    "@onekeyfe/onekey-cardano-provider": "2.0.2",
+    "@onekeyfe/onekey-conflux-provider": "2.0.2",
+    "@onekeyfe/onekey-cosmos-provider": "2.0.2",
+    "@onekeyfe/onekey-eth-provider": "2.0.2",
+    "@onekeyfe/onekey-nostr-provider": "2.0.2",
+    "@onekeyfe/onekey-polkadot-provider": "2.0.2",
+    "@onekeyfe/onekey-private-external-account-provider": "2.0.2",
+    "@onekeyfe/onekey-private-provider": "2.0.2",
+    "@onekeyfe/onekey-solana-provider": "2.0.2",
+    "@onekeyfe/onekey-sui-provider": "2.0.2",
+    "@onekeyfe/onekey-tron-provider": "2.0.2",
+    "@onekeyfe/onekey-webln-provider": "2.0.2",
     "web3": "^1.7.3"
   },
   "devDependencies": {
@@ -54,5 +54,5 @@
     "@types/node": "^20.12.7",
     "playwright": "^1.43.1"
   },
-  "gitHead": "4e9109e35064cc7dafe3a4f86a33f497ad9567ec"
+  "gitHead": "c1fc3cc6ea25726034b1f610fd1de95be8faf6c2"
 }