Feature/tg acceleration

packages/base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-base",
-  "version": "0.2.2-alpha.4",
+  "version": "0.2.2-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/base/src/utils/index.ts

@@ -1,9 +1,9 @@
-import { isMobile } from './isMobile';
+import { isMobileDevices } from './isMobile';
 import { getOriginalAddress } from './getOriginalAddress';
 import { isPortkeyApp } from './isPortkeyApp';
 import { sleep } from './sleep';
 export default {
-  isMobile,
+  isMobileDevices,
   getOriginalAddress,
   isPortkeyApp,
   sleep,

packages/base/src/utils/isMobile.ts

@@ -1,26 +1,191 @@
-const mobileRE =
-  /(android|bb\d+|meego).+mobile|armv7l|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series[46]0|samsungbrowser.*mobile|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i;
-const notMobileRE = /CrOS/;
+const appleIphone = /iPhone/i;
+const appleIpod = /iPod/i;
+const appleTablet = /iPad/i;
+const appleUniversal = /\biOS-universal(?:.+)Mac\b/i;
+const androidPhone = /\bAndroid(?:.+)Mobile\b/i; // Match 'Android' AND 'Mobile'
+const androidTablet = /Android/i;
+const amazonPhone = /(?:SD4930UR|\bSilk(?:.+)Mobile\b)/i; // Match 'Silk' AND 'Mobile'
+const amazonTablet = /Silk/i;
+const windowsPhone = /Windows Phone/i;
+const windowsTablet = /\bWindows(?:.+)ARM\b/i; // Match 'Windows' AND 'ARM'
+const otherBlackBerry = /BlackBerry/i;
+const otherBlackBerry10 = /BB10/i;
+const otherOpera = /Opera Mini/i;
+const otherChrome = /\b(CriOS|Chrome)(?:.+)Mobile/i;
+const otherFirefox = /Mobile(?:.+)Firefox\b/i; // Match 'Mobile' AND 'Firefox'
 
-export function isMobile() {
-  if (typeof navigator === 'undefined') {
-    return false;
+export type UserAgent = string;
+export type Navigator = {
+  userAgent: string;
+  platform: string;
+  maxTouchPoints?: number;
+};
+
+const isAppleTabletOnIos13 = (navigator?: Navigator): boolean => {
+  return (
+    typeof navigator !== 'undefined' &&
+    navigator.platform === 'MacIntel' &&
+    typeof navigator.maxTouchPoints === 'number' &&
+    navigator.maxTouchPoints > 1
+  );
+};
+
+function createMatch(userAgent: UserAgent): (regex: RegExp) => boolean {
+  return (regex: RegExp): boolean => regex.test(userAgent);
+}
+
+export type isMobileResult = {
+  apple: {
+    phone: boolean;
+    ipod: boolean;
+    tablet: boolean;
+    universal: boolean;
+    device: boolean;
+  };
+  amazon: {
+    phone: boolean;
+    tablet: boolean;
+    device: boolean;
+  };
+  android: {
+    phone: boolean;
+    tablet: boolean;
+    device: boolean;
+  };
+  windows: {
+    phone: boolean;
+    tablet: boolean;
+    device: boolean;
+  };
+  other: {
+    blackberry: boolean;
+    blackberry10: boolean;
+    opera: boolean;
+    firefox: boolean;
+    chrome: boolean;
+    device: boolean;
+  };
+  phone: boolean;
+  tablet: boolean;
+  any: boolean;
+};
+
+export type IsMobileParameter = UserAgent | Navigator;
+
+export function isMobile(param?: IsMobileParameter): isMobileResult {
+  let nav: Navigator = {
+    userAgent: '',
+    platform: '',
+    maxTouchPoints: 0,
+  };
+
+  if (!param && typeof navigator !== 'undefined') {
+    nav = {
+      userAgent: navigator.userAgent,
+      platform: navigator.platform,
+      maxTouchPoints: navigator.maxTouchPoints || 0,
+    };
+  } else if (typeof param === 'string') {
+    nav.userAgent = param;
+  } else if (param && param.userAgent) {
+    nav = {
+      userAgent: param.userAgent,
+      platform: param.platform,
+      maxTouchPoints: param.maxTouchPoints || 0,
+    };
   }
 
-  const ua = navigator.userAgent;
-  if (typeof ua !== 'string') return false;
+  let userAgent = nav.userAgent;
 
-  let result = mobileRE.test(ua) && !notMobileRE.test(ua);
+  // Facebook mobile app's integrated browser adds a bunch of strings that
+  // match everything. Strip it out if it exists.
+  let tmp = userAgent.split('[FBAN');
+  if (typeof tmp[1] !== 'undefined') {
+    userAgent = tmp[0];
+  }
 
-  if (
-    !result &&
-    navigator &&
-    navigator.maxTouchPoints > 1 &&
-    ua.indexOf('Macintosh') !== -1 &&
-    ua.indexOf('Safari') !== -1
-  ) {
-    result = true;
+  // Twitter mobile app's integrated browser on iPad adds a "Twitter for
+  // iPhone" string. Same probably happens on other tablet platforms.
+  // This will confuse detection so strip it out if it exists.
+  tmp = userAgent.split('Twitter');
+  if (typeof tmp[1] !== 'undefined') {
+    userAgent = tmp[0];
   }
 
+  const match = createMatch(userAgent);
+
+  const result: isMobileResult = {
+    apple: {
+      phone: match(appleIphone) && !match(windowsPhone),
+      ipod: match(appleIpod),
+      tablet:
+        !match(appleIphone) &&
+        (match(appleTablet) || isAppleTabletOnIos13(nav)) &&
+        !match(windowsPhone),
+      universal: match(appleUniversal),
+      device:
+        (match(appleIphone) ||
+          match(appleIpod) ||
+          match(appleTablet) ||
+          match(appleUniversal) ||
+          isAppleTabletOnIos13(nav)) &&
+        !match(windowsPhone),
+    },
+    amazon: {
+      phone: match(amazonPhone),
+      tablet: !match(amazonPhone) && match(amazonTablet),
+      device: match(amazonPhone) || match(amazonTablet),
+    },
+    android: {
+      phone:
+        (!match(windowsPhone) && match(amazonPhone)) ||
+        (!match(windowsPhone) && match(androidPhone)),
+      tablet:
+        !match(windowsPhone) &&
+        !match(amazonPhone) &&
+        !match(androidPhone) &&
+        (match(amazonTablet) || match(androidTablet)),
+      device:
+        (!match(windowsPhone) &&
+          (match(amazonPhone) ||
+            match(amazonTablet) ||
+            match(androidPhone) ||
+            match(androidTablet))) ||
+        match(/\bokhttp\b/i),
+    },
+    windows: {
+      phone: match(windowsPhone),
+      tablet: match(windowsTablet),
+      device: match(windowsPhone) || match(windowsTablet),
+    },
+    other: {
+      blackberry: match(otherBlackBerry),
+      blackberry10: match(otherBlackBerry10),
+      opera: match(otherOpera),
+      firefox: match(otherFirefox),
+      chrome: match(otherChrome),
+      device:
+        match(otherBlackBerry) ||
+        match(otherBlackBerry10) ||
+        match(otherOpera) ||
+        match(otherFirefox) ||
+        match(otherChrome),
+    },
+    any: false,
+    phone: false,
+    tablet: false,
+  };
+
+  result.any =
+    result.apple.device || result.android.device || result.windows.device || result.other.device;
+  // excludes 'other' devices and ipods, targeting touchscreen phones
+  result.phone = result.apple.phone || result.android.phone || result.windows.phone;
+  result.tablet = result.apple.tablet || result.android.tablet || result.windows.tablet;
+
   return result;
 }
+
+export function isMobileDevices() {
+  const isM = isMobile();
+  return isM.apple.device || isM.android.device;
+}

packages/bridge/coverage/coverage-summary.json

@@ -0,0 +1,6 @@
+{"total": {"lines":{"total":56,"covered":54,"skipped":0,"pct":96.42},"statements":{"total":58,"covered":56,"skipped":0,"pct":96.55},"functions":{"total":11,"covered":11,"skipped":0,"pct":100},"branches":{"total":16,"covered":16,"skipped":0,"pct":100},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":"Unknown"}}
+,"/Users/liuxiyang/work/code/aelf-web-login/packages/bridge/src/mountApp.tsx": {"lines":{"total":3,"covered":3,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":3,"covered":3,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
+,"/Users/liuxiyang/work/code/aelf-web-login/packages/bridge/src/useLockCallback.ts": {"lines":{"total":10,"covered":10,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":11,"covered":11,"skipped":0,"pct":100},"branches":{"total":2,"covered":2,"skipped":0,"pct":100}}
+,"/Users/liuxiyang/work/code/aelf-web-login/packages/bridge/src/useVerifier.ts": {"lines":{"total":25,"covered":25,"skipped":0,"pct":100},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":26,"covered":26,"skipped":0,"pct":100},"branches":{"total":8,"covered":8,"skipped":0,"pct":100}}
+,"/Users/liuxiyang/work/code/aelf-web-login/packages/bridge/src/utils.ts": {"lines":{"total":18,"covered":16,"skipped":0,"pct":88.88},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":18,"covered":16,"skipped":0,"pct":88.88},"branches":{"total":6,"covered":6,"skipped":0,"pct":100}}
+}

packages/bridge/jest-report.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="jest tests" tests="17" failures="0" errors="0" time="2.076">
+  <testsuite name="useLockCallback Hook" errors="0" failures="0" skipped="0" timestamp="2024-11-25T10:44:44" time="0.907" tests="4">
+    <testcase classname="useLockCallback Hook should execute function and lock" name="useLockCallback Hook should execute function and lock" time="0.108">
+    </testcase>
+    <testcase classname="useLockCallback Hook should prevent concurrent execution" name="useLockCallback Hook should prevent concurrent execution" time="0.102">
+    </testcase>
+    <testcase classname="useLockCallback Hook should allow another execution after previous is finished" name="useLockCallback Hook should allow another execution after previous is finished" time="0.202">
+    </testcase>
+    <testcase classname="useLockCallback Hook should release the lock if the callback throws an error" name="useLockCallback Hook should release the lock if the callback throws an error" time="0.006">
+    </testcase>
+  </testsuite>
+  <testsuite name="useMountSignIn" errors="0" failures="0" skipped="0" timestamp="2024-11-25T10:44:45" time="0.298" tests="2">
+    <testcase classname="useMountSignIn should render the SignInModal and children wrapped in PortkeyProvider" name="useMountSignIn should render the SignInModal and children wrapped in PortkeyProvider" time="0.039">
+    </testcase>
+    <testcase classname="useMountSignIn should memoize the rendered component" name="useMountSignIn should memoize the rendered component" time="0.001">
+    </testcase>
+  </testsuite>
+  <testsuite name="getCaContractBase()" errors="0" failures="0" skipped="0" timestamp="2024-11-25T10:44:46" time="0.263" tests="4">
+    <testcase classname="getCaContractBase() should throw error about chain is not running" name="getCaContractBase() should throw error about chain is not running" time="0.001">
+    </testcase>
+    <testcase classname="getCaContractBase() should get back contract base" name="getCaContractBase() should get back contract base" time="0">
+    </testcase>
+    <testcase classname="getIsManagerReadOnly() should throw error about chain is not running" name="getIsManagerReadOnly() should throw error about chain is not running" time="0">
+    </testcase>
+    <testcase classname="getIsManagerReadOnly() should return false" name="getIsManagerReadOnly() should return false" time="0.004">
+    </testcase>
+  </testsuite>
+  <testsuite name="useVerifier" errors="0" failures="0" skipped="0" timestamp="2024-11-25T10:44:46" time="0.056" tests="7">
+    <testcase classname="useVerifier should return getRecommendationVerifier and verifySocialToken functions" name="useVerifier should return getRecommendationVerifier and verifySocialToken functions" time="0.001">
+    </testcase>
+    <testcase classname="useVerifier should call getRecommendationVerifier with correct chainId" name="useVerifier should call getRecommendationVerifier with correct chainId" time="0.001">
+    </testcase>
+    <testcase classname="useVerifier should handle Apple account type correctly" name="useVerifier should handle Apple account type correctly" time="0">
+    </testcase>
+    <testcase classname="useVerifier should handle Google account type correctly" name="useVerifier should handle Google account type correctly" time="0.001">
+    </testcase>
+    <testcase classname="useVerifier should handle Telegram account type correctly" name="useVerifier should handle Telegram account type correctly" time="0.001">
+    </testcase>
+    <testcase classname="useVerifier should throw error for unsupported account type" name="useVerifier should throw error for unsupported account type" time="0.001">
+    </testcase>
+    <testcase classname="useVerifier should throw error if verifier is missing" name="useVerifier should throw error if verifier is missing" time="0.003">
+    </testcase>
+  </testsuite>
+</testsuites>